From 7775208dbe04ec1e403c26f7c979e6bbe5d46f5e Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 9 Aug 2018 04:10:05 +0500
Subject: [PATCH] =?UTF-8?q?LIL-615=20=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8,=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D1=81=D0=BE=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B6=D0=B0=D1=82=20=D0=BA=D0=B8=D1=80=D0=B8=D0=BB=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=86=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/course/filters.py                                     | 2 +-
 apps/course/templates/course/courses.html                  | 4 ++--
 apps/course/templates/course/inclusion/category_items.html | 3 ++-
 apps/course/templatetags/lilcity_category.py               | 2 +-
 web/src/js/modules/courses.js                              | 6 +++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/course/filters.py b/apps/course/filters.py
index 827079e6..6e4e873e 100644
--- a/apps/course/filters.py
+++ b/apps/course/filters.py
@@ -4,7 +4,7 @@ from .models import Course
 
 
 class CourseFilter(django_filters.FilterSet):
-    category = django_filters.CharFilter(field_name='category__title', lookup_expr='iexact')
+    category = django_filters.CharFilter(field_name='category')
 
     class Meta:
         model = Course
diff --git a/apps/course/templates/course/courses.html b/apps/course/templates/course/courses.html
index a3277174..8f6f57d2 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 %} selected{% endif %}">
-                <div class="select__head js-select-head">{% if category %}{{ 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 %} active{% endif %}"
                       data-category-option data-category-url="{% url 'courses' %}">
diff --git a/apps/course/templates/course/inclusion/category_items.html b/apps/course/templates/course/inclusion/category_items.html
index 5e6aeef5..8dd8a0e9 100644
--- a/apps/course/templates/course/inclusion/category_items.html
+++ b/apps/course/templates/course/inclusion/category_items.html
@@ -1,5 +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 }}" data-category-url="{% url 'courses' %}?category={{ cat.title }}">
+  <div class="select__option js-select-option{% if category and category == cat.id %} active{% endif %}"
+       data-category-option data-category-name="{{ cat.title }}" data-category-url="{% url 'courses' %}?category={{ cat.id }}">
     <div class="select__title">{{ cat.title }}</div>
   </div>
 {% endfor %}
\ No newline at end of file
diff --git a/apps/course/templatetags/lilcity_category.py b/apps/course/templatetags/lilcity_category.py
index 957e50c2..f4596935 100644
--- a/apps/course/templatetags/lilcity_category.py
+++ b/apps/course/templatetags/lilcity_category.py
@@ -9,7 +9,7 @@ register = template.Library()
 def category_items(category=None):
     return {
         'category_items': Category.objects.filter(courses__status=Course.PUBLISHED).exclude(courses=None).distinct(),
-        'category': category,
+        'category': int(category[0]) if category and category[0] else None,
     }
 
 
diff --git a/web/src/js/modules/courses.js b/web/src/js/modules/courses.js
index 2581df46..1353ae43 100644
--- a/web/src/js/modules/courses.js
+++ b/web/src/js/modules/courses.js
@@ -12,6 +12,10 @@ moment.locale('ru');
 const history = createHistory();
 
 $(document).ready(function () {
+    const currentCategory = $('div.js-select-option.active[data-category-option]').attr('data-category-name');
+    if(currentCategory) {
+        $('.js-select[data-category-select] .js-select-head').text(currentCategory);
+    }
     // Обработчик отложенных курсов
     setInterval(() => {
         $('div[data-future-course]').each((_, element) => {
@@ -129,4 +133,4 @@ function load_courses(coursesUrl, fromStart) {
                 buttonElement.removeClass('loading');
             }
         });
-}
\ No newline at end of file
+}