Fix stacked inlines thanks to a special grapelli branch, add various admin filters

diff --git a/app/organization/magazine/admin.py b/app/organization/magazine/admin.py
index 8556044b8e8e7e591d23a0fd0a62aad534142488..083621e203cd5b3141f83ca3e6fbf37dfa05a9db 100644 (file)
--- a/app/organization/magazine/admin.py
+++ b/app/organization/magazine/admin.py
@@ -1,25 +1,30 @@
 from django.contrib import admin
 from django import forms
 from copy import deepcopy
-from mezzanine.core.admin import DisplayableAdmin
+from mezzanine.core.admin import *
 from mezzanine.pages.admin import PageAdmin
 from orderable.admin import OrderableAdmin, OrderableTabularInline
 from organization.magazine.models import Article, Brief ,Topic
 
 
 class ArticleAdmin(admin.ModelAdmin):
+
     model = Article
 
+
 class ArticleAdminDisplayable(DisplayableAdmin):
 
     fieldsets = deepcopy(ArticleAdmin.fieldsets)
     exclude = ('related_posts',)
+    filter_horizontal = ['categories', 'related_articles', ]
+
 
 class BriefAdmin(OrderableTabularInline):
 
     model = Brief
 
-class BriefAdminDisplayable(OrderableAdmin):
+
+class BriefAdminDisplayable(BaseTranslationModelAdmin, OrderableAdmin):
 
     list_display = ('title', 'local_content', 'sort_order_display',)
     fieldsets = deepcopy(BriefAdmin.fieldsets)

diff --git a/app/organization/team/admin.py b/app/organization/team/admin.py
index aa0311528ed250b04763456bd77598c9614de588..9467b9755a20a711a425663190a030f8a44833dc 100644 (file)
--- a/app/organization/team/admin.py
+++ b/app/organization/team/admin.py
@@ -17,15 +17,17 @@ class ActivityAdmin(BaseTranslationModelAdmin):
     model = Activity
 
 
-class ActivityInline(TabularDynamicInlineAdmin):
+class ActivityInline(StackedDynamicInlineAdmin):
 
     model = Activity
+    filter_horizontal = ['teams', ]
 
 
 class TeamAdmin(PageAdmin):
 
     inlines = [PageBlockInline, PageImageInline]
 
+
 class DepartmentAdmin(PageAdmin):
 
     inlines = [PageBlockInline, PageImageInline]
@@ -56,4 +58,4 @@ admin.site.register(Department, DepartmentAdmin)
 admin.site.register(Team, TeamAdmin)
 # admin.site.register(Team)
 admin.site.register(Person, PersonAdmin)
-admin.site.register(Activity, ActivityAdmin)
+# admin.site.register(Activity, ActivityAdmin)

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 5cebbcf92cf6f4f4f38ce67c25a0687fe1e34b7f..7bdf3e503a21f2864fe130d57417833158ed5918 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -20,6 +20,7 @@ patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 # Staging
 # pip install psycopg2
 # pip install -U https://forge.ircam.fr/p/django-eve/source/download/dev/
+# pip install -U https://github.com/stephenmcd/grappelli-safe/archive/dynamic_stacked.zip
 
 chown -R $uid:$gid $media
 
@@ -42,7 +43,7 @@ else
     #     --command='python '$manage' collectstatic --noinput' $app &
 
     python $manage collectstatic --noinput
-    
+
     uwsgi --socket :$port --wsgi-file $wsgi --chdir $app --master \
     --processes $processes --threads $threads \
     --uid $uid --gid $gid \

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 381037a59353272dc59cf0bc16d7e16705773551..a2f808ed35f0758702342032e7c7441c834a0e6d 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,4 @@
 -e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.2
--e git+https://github.com/stephenmcd/mezzanine.git#egg=mezzanine-4.1-dev
--e git+https://github.com/stephenmcd/grappelli-safe#egg=grappelli-safe-0.4.2
+-e git+https://github.com/stephenmcd/mezzanine.git@master#egg=mezzanine-4.1-master
+-e git+https://github.com/stephenmcd/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
 #https://forge.ircam.fr/p/django-eve/source/download/dev/
-#
-#