From: Guillaume Pellerin Date: Fri, 19 Aug 2016 13:35:08 +0000 (+0200) Subject: Use mezzanine master branch X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c4bca49fb3e9d0535de9908b8b7d4eca76468ec;p=mezzo.git Use mezzanine master branch --- diff --git a/app/organization/pages/admin.py b/app/organization/pages/admin.py index e0ae08e7..3b3441bf 100644 --- a/app/organization/pages/admin.py +++ b/app/organization/pages/admin.py @@ -15,11 +15,13 @@ class DynamicContentHomeSliderInline(StackedDynamicInlineAdmin): model = DynamicContentHomeSlider form = DynamicContentHomeSliderForm + class DynamicContentHomeBodyInline(StackedDynamicInlineAdmin): model = DynamicContentHomeBody form = DynamicContentHomeBodyForm + class HomeAdminDisplayable(BaseTranslationModelAdmin): inlines = [DynamicContentHomeSliderInline, DynamicContentHomeBodyInline ] diff --git a/app/organization/pages/forms.py b/app/organization/pages/forms.py index 8b5e9735..80cbf52f 100644 --- a/app/organization/pages/forms.py +++ b/app/organization/pages/forms.py @@ -24,6 +24,7 @@ class DynamicContentHomeSliderForm(autocomplete.FutureModelForm): model = DynamicContentHomeSlider fields = ('__all__') + class DynamicContentHomeBodyForm(autocomplete.FutureModelForm): content_object = dal_queryset_sequence.fields.QuerySetSequenceModelField( diff --git a/requirements-dev.txt b/requirements-dev.txt index ab15f0e4..7e7d273b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2 --e git+https://github.com/yomguy/mezzanine.git@9917784#egg=mezzanine-4.2-dev +-e git+https://github.com/yomguy/mezzanine.git@master#egg=mezzanine-4.2-dev -e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2 #-e git+https://github.com/yourlabs/django-autocomplete-light.git#egg=django-autocomplete-light #https://forge.ircam.fr/p/django-eve/source/download/dev/