From: Emilie Date: Wed, 24 Aug 2016 14:41:13 +0000 (+0200) Subject: Autocomplete : commenting event X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6d5960aa89bae5313064e1d8e42ca6c1ee27d52d;p=mezzo.git Autocomplete : commenting event --- diff --git a/app/organization/pages/forms.py b/app/organization/pages/forms.py index 763576ce..12be7870 100644 --- a/app/organization/pages/forms.py +++ b/app/organization/pages/forms.py @@ -5,7 +5,7 @@ import dal_select2_queryset_sequence from mezzanine.core.models import Orderable from organization.magazine.models import Article, Topic, Brief from organization.pages.models import CustomPage -from mezzanine_agenda.models import Event +# from mezzanine_agenda.models import Event from organization.pages.models import DynamicContentHomeSlider, DynamicContentHomeBody class DynamicContentHomeSliderForm(autocomplete.FutureModelForm): @@ -13,7 +13,7 @@ class DynamicContentHomeSliderForm(autocomplete.FutureModelForm): content_object = dal_queryset_sequence.fields.QuerySetSequenceModelField( queryset=autocomplete.QuerySetSequence( Article.objects.all(), - Event.objects.all(), + # Event.objects.all(), CustomPage.objects.all(), ), required=False, @@ -33,7 +33,7 @@ class DynamicContentHomeBodyForm(autocomplete.FutureModelForm): content_object = dal_queryset_sequence.fields.QuerySetSequenceModelField( queryset=autocomplete.QuerySetSequence( Article.objects.all(), - Event.objects.all(), + # Event.objects.all(), CustomPage.objects.all(), Brief.objects.all(), ), diff --git a/app/organization/pages/views.py b/app/organization/pages/views.py index c36f2b17..c4018bca 100644 --- a/app/organization/pages/views.py +++ b/app/organization/pages/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render from django.views.generic import DetailView, ListView, TemplateView from dal import autocomplete from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView -from mezzanine_agenda.models import Event +# from mezzanine_agenda.models import Event from organization.pages.models import CustomPage from organization.core.views import SlugMixin from organization.magazine.models import Article, Topic, Brief @@ -34,14 +34,14 @@ class DynamicContentHomeSliderView(Select2QuerySetSequenceView): articles = Article.objects.all() custompage = CustomPage.objects.all() - events = Event.objects.all() + # events = Event.objects.all() if self.q: articles = articles.filter(title__icontains=self.q) custompage = custompage.filter(title__icontains=self.q) - events = events.filter(title__icontains=self.q) + # events = events.filter(title__icontains=self.q) - qs = autocomplete.QuerySetSequence(articles, custompage, events ) + qs = autocomplete.QuerySetSequence(articles, custompage ) #, events if self.q: # This would apply the filter on all the querysets @@ -58,16 +58,16 @@ class DynamicContentHomeBodyView(Select2QuerySetSequenceView): articles = Article.objects.all() custompage = CustomPage.objects.all() - events = Event.objects.all() + # events = Event.objects.all() briefs = Brief.objects.all() if self.q: articles = articles.filter(title__icontains=self.q) custompage = custompage.filter(title__icontains=self.q) - events = events.filter(title__icontains=self.q) + # events = events.filter(title__icontains=self.q) briefs = briefs.filter(title__icontains=self.q) - qs = autocomplete.QuerySetSequence(articles, custompage, events, briefs) + qs = autocomplete.QuerySetSequence(articles, custompage, briefs) #, events if self.q: # This would apply the filter on all the querysets