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

LIL-615 fix

See merge request lilcity/backend!98

apps/course/templates/course/inclusion/category_items.html

@@ -1,5 +1,5 @@
 {% for cat in category_items %}
-  <div class="select__option js-select-option{% if category and category == cat.id %} active{% endif %}"
+  <div class="select__option js-select-option{% if 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>

apps/course/templates/course/inclusion/category_menu_items.html

@@ -2,7 +2,7 @@
   <div class="header__title">Все курсы</div>
 </a>
 {% for cat in category_items %}
-<a class="header__link{% if category.0 == cat.title %} active{% endif %}" data-category-name="{{ cat.title }}" href="{% url 'courses' %}?category={{ cat.title }}">
+<a class="header__link{% if category == cat.id %} active{% endif %}" data-category-name="{{ cat.title }}" href="{% url 'courses' %}?category={{ cat.id }}">
   <div class="header__title">{{ cat.title }}</div>
 </a>
 {% endfor %}

apps/course/templatetags/lilcity_category.py

@@ -17,5 +17,5 @@ def category_items(category=None):
 def category_menu_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,
     }