From 366858bd42c63079b107c7c0790412e992b48ac2 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Mon, 10 Sep 2018 17:56:05 +0500
Subject: [PATCH] =?UTF-8?q?LIL-601=20=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=20=D0=BA?=
 =?UTF-8?q?=D1=83=D1=80=D1=81=D0=B0=20=D0=92=D0=BE=D0=B7=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D1=83=D1=80=D1=81=D0=B5=20?=
 =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=BF=D0=BE=20=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B7=D1=80=D0=B0=D1=81=D1=82=D1=83=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D1=83=D1=80=D1=81=D0=B0=D1=85=20=D0=91=D0=BB=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE=D0=BC=20?=
 =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B8=20=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=D1=85?=
 =?UTF-8?q?=20=D1=83=D1=80=D0=BE=D0=BA=D0=B0,=20=D0=BA=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D0=B0=20=D0=B8=20=D1=82=D0=B4=20=D0=95=D1=89=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=BC=D0=B5=D0=BB=D0=BE=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/course/templates/course/course.html      |  3 ++
 .../templates/course/course_only_lessons.html |  5 ---
 apps/course/templates/course/courses.html     |  4 +-
 .../course/inclusion/category_items.html      |  6 +--
 apps/course/views.py                          |  5 +--
 .../templates/school/livelesson_detail.html   |  2 +-
 .../templates/school/livelessons_list.html    |  2 +-
 web/src/js/modules/courses.js                 | 40 +++++++++----------
 8 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html
index f5697f3b..e9bda69a 100644
--- a/apps/course/templates/course/course.html
+++ b/apps/course/templates/course/course.html
@@ -25,6 +25,9 @@
         </div>
         <div class="go__title">Вернуться</div>
       </a>
+      {% if has_full_access %}
+      <a class="go__btn btn" href="{% url 'course_edit' course.id %}">Редактировать</a>
+      {% endif %}
       {% if course.author != request.user and not paid and course.price %}
       <a
         class="go__btn btn{% if pending %} btn_gray{% endif %} btn_md"
diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html
index bc679ca4..be9867a4 100644
--- a/apps/course/templates/course/course_only_lessons.html
+++ b/apps/course/templates/course/course_only_lessons.html
@@ -188,11 +188,6 @@
                 <a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a>
               </div>
             </div>
-            <div class="lessons__row">
-              {% if course.author == request.user or request.user.role >= request.user.TEACHER_ROLE or paid %}
-              <a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a>
-              {% endif %}
-            </div>
           </div>
         {% endfor %}
       </div>
diff --git a/apps/course/templates/course/courses.html b/apps/course/templates/course/courses.html
index 2f47675a..f56279f6 100644
--- a/apps/course/templates/course/courses.html
+++ b/apps/course/templates/course/courses.html
@@ -20,8 +20,8 @@
         <div class="head__right">
           <div class="head__field field">
             <div class="field__wrap">
-              <div class="field__select select js-select{% if category.0 %} selected{% endif %}">
-                <div class="select__head js-select-head">{% if category.0 %}{{ category.0 }}{% else %}Категории{% endif %}</div>
+              <div class="field__select select js-select{% if category %} selected{% endif %}" data-category-select>
+                <div class="select__head js-select-head">Категории</div>
                 <div class="select__drop js-select-drop">
                   <div class="select__option js-select-option{% if not category.0 %} active{% endif %}" data-category-option>
                     <div class="select__title">Все категории</div>
diff --git a/apps/course/templates/course/inclusion/category_items.html b/apps/course/templates/course/inclusion/category_items.html
index 66fb771b..9ebd98ed 100644
--- a/apps/course/templates/course/inclusion/category_items.html
+++ b/apps/course/templates/course/inclusion/category_items.html
@@ -1,6 +1,6 @@
 {% for cat in category_items %}
-  <div class="select__option js-select-option{% if category and category.0 == cat.title %} active{% endif %}" data-category-option
-       data-category-name="{{ cat.title }}">
+  <div class="select__option js-select-option{% if category == cat.id %} active{% endif %}" data-category-option
+       data-category-name="{{ cat.title }}" data-category="{{ cat.id }}">
     <div class="select__title">{{ cat.title }}</div>
   </div>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/apps/course/views.py b/apps/course/views.py
index fa2aecc6..6b578923 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -167,9 +167,8 @@ class CourseEditView(TemplateView):
             self.object = Course.objects.create(
                 author=request.user,
             )
-        #TODO
-        #if (request.user != self.object.author and request.user.role < User.AUTHOR_ROLE) or request.user.role != User.ADMIN_ROLE:
-        #    raise Http404
+        if request.user != self.object.author and request.user.role != User.ADMIN_ROLE:
+           raise Http404
         return super().get(request)
 
     def get_context_data(self):
diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html
index cfa77ba3..f553f447 100644
--- a/apps/school/templates/school/livelesson_detail.html
+++ b/apps/school/templates/school/livelesson_detail.html
@@ -7,7 +7,7 @@
   <div class="section__center center center_sm">
     <div class="lesson">
       <div class="lesson__subtitle subtitle">{{ livelesson.title }}</div>
-      <div class="lesson__content">{{ livelesson.short_description | linebreaks }}</div>
+      <div class="lesson__content">{{ livelesson.short_description | safe | linebreaks }}</div>
       <div class="lesson__video video">
         {% if livelesson.stream_index %}
         <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen
diff --git a/apps/school/templates/school/livelessons_list.html b/apps/school/templates/school/livelessons_list.html
index f19f81f0..1c0a1778 100644
--- a/apps/school/templates/school/livelessons_list.html
+++ b/apps/school/templates/school/livelessons_list.html
@@ -24,7 +24,7 @@
           </div>
           <div class="lessons__subtitle subtitle">{{ livelesson.date }} // {{ livelesson.title }}</div>
           <div class="lessons__row">
-            <div class="lessons__content">{{ livelesson.short_description | linebreaks }}</div>
+            <div class="lessons__content">{{ livelesson.short_description | safe | linebreaks | truncatechars_html:800 }}</div>
           </div>
         </div>
         {% endfor %}
diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js
index 9d05402b..9996167e 100644
--- a/web/src/js/modules/courses.js
+++ b/web/src/js/modules/courses.js
@@ -12,10 +12,12 @@ moment.locale('ru');
 const history = createHistory();
 
 $(document).ready(function () {
-    const currentCategory = $('div.js-select-option.active[data-category-option]').attr('data-category-name'),
-      age =  $('div.js-select-option.active[data-age-option]').data('age'), page = 1;
-    if(currentCategory) {
-        $('.js-select[data-category-select] .js-select-head').text(currentCategory);
+    const categoryName = $('div.js-select-option.active[data-category-option]').attr('data-category-name');
+    let category = $('div.js-select-option.active[data-category-option]').attr('data-category');
+    let age =  $('div.js-select-option.active[data-age-option]').data('age');
+    let page = 1;
+    if(category) {
+        $('.js-select[data-category-select] .js-select-head').text(categoryName);
     }
     // Обработчик отложенных курсов
     setInterval(() => {
@@ -37,10 +39,10 @@ $(document).ready(function () {
     // Обработчик выбора категории
     $('div.js-select-option[data-category-option]').on('click', function (e) {
         e.preventDefault();
-        const currentCategory = $(this).attr('data-category-name');
+        const categoryName = $(this).attr('data-category-name');
         $('[data-category-name]').removeClass('active');
-        $(`[data-category-name='${currentCategory}']`).addClass('active');
-        category = $(this).attr('data-category-name');
+        $(`[data-category-name='${categoryName}']`).addClass('active');
+        category = $(this).attr('data-category');
         page = 1;
         loadCourses(true);
     });
@@ -147,18 +149,12 @@ $(document).ready(function () {
                     // Нет результатов, скрываем кнопку
                     buttonElement.hide();
                 }
-            }
-        })
-        .fail(function (xhr) {
-            if (xhr.status === 404) {
-                // Нет результатов, скрываем кнопку
-                buttonElement.hide();
-            }
-        })
-        .always(function () {
-            $('.courses__list').css('opacity', '1');
-            if (buttonElement) {
-                buttonElement.removeClass('loading');
-            }
-        });
-}
+            })
+            .always(function () {
+                $('.courses__list').css('opacity', '1');
+                if (buttonElement) {
+                    buttonElement.removeClass('loading');
+                }
+            });
+    }
+});