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 @@