From d52bc0fe15889b2b20154ec9db6c77c2b3fcb813 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sat, 1 Jun 2013 19:23:15 +0200 Subject: [PATCH] Document actions --- djadmin2/actions.py | 6 ++++-- docs/ref/actions.rst | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/djadmin2/actions.py b/djadmin2/actions.py index e1ced5a..4360ef9 100644 --- a/djadmin2/actions.py +++ b/djadmin2/actions.py @@ -58,6 +58,9 @@ class DeleteSelectedAction(BaseListAction): description = ugettext_lazy("Delete selected items") + # TODO - power this off the ADMIN2_THEME_DIRECTORY setting + template = "admin2/bootstrap/actions/delete_selected_confirmation.html" + def get_response(self): if self.request.POST.get('confirmed'): # The user has confirmed that they want to delete the objects. @@ -74,7 +77,6 @@ class DeleteSelectedAction(BaseListAction): # The user has not confirmed that they want to delete the objects, so # render a template asking for their confirmation. if self.has_permission: - template = 'admin2/bootstrap/actions/delete_selected_confirmation.html' def _format_callback(obj): opts = utils.model_options(obj) @@ -89,7 +91,7 @@ class DeleteSelectedAction(BaseListAction): 'objects_name': self.objects_name, 'deletable_objects': collector.nested(_format_callback), } - return TemplateResponse(self.request, template, context) + return TemplateResponse(self.request, self.template, context) else: message = _("Permission to delete %s denied" % self.objects_name) messages.add_message(self.request, messages.INFO, message) diff --git a/docs/ref/actions.rst b/docs/ref/actions.rst index 65748df..043bb64 100644 --- a/docs/ref/actions.rst +++ b/docs/ref/actions.rst @@ -51,8 +51,12 @@ In our blog/admin.py module we write: from .models import Post, Comment - class DeleteAllComments(BaseListAction): - description = ugettext_lazy("Delete selected items") + class DeleteAllComments(djadmin2.actions.BaseListAction): + description = "Delete selected items" + template = "blog/actions/delete_all_comments_confirmation.html + + class PostAdmin(djadmin2.ModelAdmin2): + actions = [DeleteAllComments] djadmin2.default.register(Post, PostAdmin) djadmin2.default.register(Comment)