Merge pull request #356 from aldryn/feature/publish-action

toolbar: publish action
divio · Mar 23, 2016 · e7b9949 · e7b9949
2 parents de506da + 24a4b41
commit e7b9949
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/aldryn_newsblog/admin.py b/aldryn_newsblog/admin.py
@@ -99,7 +99,7 @@ class ArticleAdmin(
         make_featured, make_not_featured,
         make_published, make_unpublished,
     )
-    fieldsets = (
+    _fieldsets = (
         (None, {
             'fields': (
                 'title',
@@ -130,6 +130,13 @@ class ArticleAdmin(
             )
         }),
     )
+
+    _publish_fieldsets = (
+        (None, {
+            'fields': ('publishing_date', 'is_published')
+        }),
+    )
+
     app_config_values = {
         'default_published': 'is_published'
     }
@@ -147,6 +154,10 @@ def add_view(self, request, *args, **kwargs):
         request.GET = data
         return super(ArticleAdmin, self).add_view(request, *args, **kwargs)
 
+    def get_fieldsets(self, request, obj=None):
+        if 'publish' in request.GET:
+            return self._publish_fieldsets
+        return self._fieldsets
 
 admin.site.register(models.Article, ArticleAdmin)
 

diff --git a/aldryn_newsblog/cms_toolbar.py b/aldryn_newsblog/cms_toolbar.py
@@ -115,8 +115,22 @@ def populate(self):
                     url_args = {'language': language, }
                 url = get_admin_url('aldryn_newsblog_article_change',
                                     [article.pk, ], **url_args)
-                menu.add_modal_item(_('Edit this article'), url=url,
-                                    active=True)
+                menu.add_modal_item(
+                    _('Edit this article'),
+                    url=url, active=True
+                )
+                if article.published:
+                    title = _('Unpublish this article')
+                else:
+                    title = _('Publish this article')
+
+                url_args['publish'] = 1
+                url = get_admin_url(
+                    'aldryn_newsblog_article_change',
+                    [article.pk, ],
+                    **url_args
+                )
+                menu.add_modal_item(title, url=url)
 
             if delete_article_perm and article:
                 redirect_url = self.get_on_delete_redirect_url(