From 31583c1e3643aa2cce4754b62607424236da8ec7 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Tue, 9 Aug 2016 13:28:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D1=8C=D1=82=D1=80:=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=8F=20=D1=81=20=D1=82=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=B9=20=D0=B4=D0=B0=D1=82=D1=8B=20(=D0=B1=D1=8B?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B7=D0=B0=D0=B2=D1=82=D1=80=D0=B0=D1=88=D0=BD?=
 =?UTF-8?q?=D1=8F=D1=8F);=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BD=D0=B0=20=D0=BD=D1=83=D0=B6?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=D1=85=20(=D0=B1=D1=8B=D0=BB=D0=B0=20=D0=BF=D0=BE=D1=87?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=BD=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 events/forms.py                    | 4 ++--
 events/mixin.py                    | 1 +
 templates/client/base_catalog.html | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/events/forms.py b/events/forms.py
index 879223e1..99798d8b 100644
--- a/events/forms.py
+++ b/events/forms.py
@@ -230,7 +230,7 @@ class FilterForm(forms.Form):
             qs = qs.load_all()
             for model in models:
                 qs = qs.load_all_queryset(model, model.enable.all())
-        qs = qs.filter(data_end__gte=datetime.now())
+        qs = qs.filter(data_begin__gte=datetime.now().date())
         return qs
 
     def recalculate_choices(self):
@@ -396,7 +396,7 @@ class FilterForm(forms.Form):
         return choices
 
     def make_default_where(self, **kwargs):
-        return ''' (`{db_table}`.`is_published` = True) AND (`{db_table}`.`data_end` >= '{date_today}') '''\
+        return ''' (`{db_table}`.`is_published` = True) AND (`{db_table}`.`data_begin` >= '{date_today}') '''\
             .format(date_today=datetime.now().strftime('%Y-%m-%d'), **kwargs)
 
     def make_count_select(self, field):
diff --git a/events/mixin.py b/events/mixin.py
index 95500ba3..ad3d03b1 100644
--- a/events/mixin.py
+++ b/events/mixin.py
@@ -6,6 +6,7 @@ class BaseFilterMixin(object):
     def get_context_data(self, **kwargs):
         context = super(BaseFilterMixin, self).get_context_data(**kwargs)
         context['event_type'] = self.event_type
+        context['can_filter'] = True
         return context
 
 
diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html
index 4b1d80b4..0f680bd6 100644
--- a/templates/client/base_catalog.html
+++ b/templates/client/base_catalog.html
@@ -23,7 +23,7 @@
                         <div id="filter_form_wraper">
                             {% include 'client/includes/events/filter_form.html' %}
                         </div>
-                    {% else %}
+                    {% elif can_filter == True %}
                         <div id="filter_form_wraper">
                             <a href="{% url 'events:main' %}" id="get_filters">ВЫБРАТЬ ПО КРИТЕРИЯМ:</a>
                         </div>