From c7e60c44e2b9fbabd69c6e36121c1983abbdad85 Mon Sep 17 00:00:00 2001
From: spacenergy <spacenergy@me.com>
Date: Fri, 2 Oct 2015 16:52:21 +0600
Subject: [PATCH] auto

---
 batiskaf/jinja2.py                                       | 2 +-
 batiskaf/templates/jinja2/base.jinja                     | 4 ----
 batiskaf/templates/jinja2/includes/category_filter.jinja | 4 ++--
 store/models.py                                          | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/batiskaf/jinja2.py b/batiskaf/jinja2.py
index cdf7a24..dae2ef2 100644
--- a/batiskaf/jinja2.py
+++ b/batiskaf/jinja2.py
@@ -14,7 +14,7 @@ def environment(**options):
         'static': staticfiles_storage.url,
         'url': reverse,
         'main_categories': Category.objects.filter(parent__isnull=True).order_by('pk'),
-        'all_brands': Brand.objects.order_by('pk'),
+        'all_brands': Brand.objects.order_by('title'),
     })
     env.filters['linebreaks'] = linebreaks
     env.filters['thumbnail'] = thumbnail
diff --git a/batiskaf/templates/jinja2/base.jinja b/batiskaf/templates/jinja2/base.jinja
index ea7e2c6..90b884a 100644
--- a/batiskaf/templates/jinja2/base.jinja
+++ b/batiskaf/templates/jinja2/base.jinja
@@ -159,10 +159,6 @@
                                                         </div>
                                                     {% endfor %}
 
-
-
-
-
                                             </div>
                                         </div>
                                     </li>
diff --git a/batiskaf/templates/jinja2/includes/category_filter.jinja b/batiskaf/templates/jinja2/includes/category_filter.jinja
index 92d5fee..0d45a24 100644
--- a/batiskaf/templates/jinja2/includes/category_filter.jinja
+++ b/batiskaf/templates/jinja2/includes/category_filter.jinja
@@ -4,7 +4,7 @@
     {% if not category.hide_products and category.childs.all() %}
         <div class="category-filter-title">&rarr;&nbsp;&nbsp;&nbsp;Категории</div>
         <ul class="attr-filter">
-            {% for child in category.childs.all() %}
+            {% for child in category.childs.order_by('priority') %}
                 <li>
                     <a href="{{ child.get_absolute_url() }}">{{ child.title }}</a>
                 </li>
@@ -15,7 +15,7 @@
 
     <div class="category-filter-title">&rarr;&nbsp;&nbsp;&nbsp;Производитель</div>
     <ul class="attr-filter">
-        {% for choise in category.brands() %}
+        {% for choise in category.brands().order_by('title') %}
             <li>
                 <label><input type="checkbox" name="brand[{{ loop.index0 }}]" value="{{ choise.pk }}"
                         {% if choise.pk.__str__() in request.GET.getlist('brand[]') %}
diff --git a/store/models.py b/store/models.py
index 9914e52..2535b6c 100644
--- a/store/models.py
+++ b/store/models.py
@@ -87,7 +87,7 @@ class Category(models.Model):
         return Brand.objects.filter(pk__in=brand_pks).order_by('title')
 
     def get_childs_ordered_by_count(self):
-        return self.childs.annotate(Count('childs')).order_by('priority', '-childs__count')
+        return self.childs.annotate(Count('childs')).order_by('priority') #, '-childs__count')
 
 
 class Attribute(models.Model):