diff --git a/example/blog/actions.py b/example/blog/actions.py index ecc254f..f090e1a 100644 --- a/example/blog/actions.py +++ b/example/blog/actions.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import, unicode_literals +from django.utils.translation import ugettext_lazy, pgettext_lazy +from django.contrib import messages + from djadmin2.actions import BaseListAction from djadmin2 import permissions -from django.utils.translation import ugettext_lazy, pgettext_lazy class CustomPublishAction(BaseListAction): @@ -46,3 +48,23 @@ class PublishAllItemsAction(BaseListAction): def process_queryset(self): self.get_queryset().update(published=True) + + +def unpublish_items(request, queryset): + queryset.update(published=False) + messages.add_message(request, messages.INFO, ugettext_lazy(u'Items unpublished')) + +# Translators : action description +unpublish_items.description = ugettext_lazy('Unpublish selected items') + + +def unpublish_all_items(request, queryset): + queryset.update(published=False) + messages.add_message( + request, + messages.INFO, + ugettext_lazy('Items unpublished'), + ) + +unpublish_all_items.description = ugettext_lazy('Unpublish all items') +unpublish_all_items.only_selected = False diff --git a/example/blog/admin2.py b/example/blog/admin2.py index 9af26a4..f71ae01 100644 --- a/example/blog/admin2.py +++ b/example/blog/admin2.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import division, absolute_import, unicode_literals -from django.contrib import messages from django.utils.translation import ugettext_lazy import djadmin2 @@ -9,7 +8,8 @@ from djadmin2 import renderers from djadmin2.actions import DeleteSelectedAction # Import your custom models -from .actions import CustomPublishAction, PublishAllItemsAction +from .actions import (CustomPublishAction, PublishAllItemsAction, + unpublish_items, unpublish_all_items) from .models import Post, Comment @@ -17,26 +17,6 @@ class CommentInline(djadmin2.Admin2TabularInline): model = Comment -def unpublish_items(request, queryset): - queryset.update(published=False) - messages.add_message(request, messages.INFO, ugettext_lazy(u'Items unpublished')) - -# Translators : action description -unpublish_items.description = ugettext_lazy('Unpublish selected items') - - -def unpublish_all_items(request, queryset): - queryset.update(published=False) - messages.add_message( - request, - messages.INFO, - ugettext_lazy('Items unpublished'), - ) - -unpublish_all_items.description = ugettext_lazy('Unpublish all items') -unpublish_all_items.only_selected = False - - class PostAdmin(djadmin2.ModelAdmin2): list_actions = [ DeleteSelectedAction, CustomPublishAction,