Merge branch 'hotfix/LIL-615' into 'master'

LIL-615 Поменять ссылки, которые содержат кириллицу

See merge request lilcity/backend!93

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

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' %}">

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 %}

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,
     }
 
 

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');
             }
         });
-}
+}