Change list actions to be list_actions so their nature is more explicit

This commit is contained in:
Daniel Greenfeld 2013-05-31 15:37:55 +02:00
parent 6a9eb0b3b3
commit 1916f7cba4
3 changed files with 5 additions and 8 deletions

View file

@ -3,6 +3,6 @@ from django.conf import settings
MODEL_ADMIN_ATTRS = (
'list_display', 'list_display_links', 'list_filter', 'admin',
'index_view', 'detail_view', 'create_view', 'update_view', 'delete_view',
'get_default_view_kwargs', 'get_actions')
'get_default_view_kwargs', 'get_list_actions')
ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")

View file

@ -45,7 +45,7 @@ class ModelAdmin2(object):
list_fields = []
#This shows up on the DocumentListView of the Posts
list_actions = []
list_actions = [actions.delete_selected]
# This shows up in the DocumentDetailView of the Posts.
document_actions = []
@ -84,9 +84,6 @@ class ModelAdmin2(object):
api_list_view = apiviews.ListCreateAPIView
api_detail_view = apiviews.RetrieveUpdateDestroyAPIView
# Actions
actions = [actions.delete_selected]
def __init__(self, model, admin, name=None, **kwargs):
self.name = name
self.model = model
@ -214,11 +211,11 @@ class ModelAdmin2(object):
def api_urls(self):
return self.get_api_urls(), None, None
def get_actions(self):
def get_list_actions(self):
actions_dict = {}
for cls in type(self).mro()[::-1]:
class_actions = getattr(cls, 'actions', [])
class_actions = getattr(cls, 'list_actions', [])
for action in class_actions:
actions_dict[action.__name__] = {
'name': action.__name__,

View file

@ -75,7 +75,7 @@ class ModelListView(AdminModel2Mixin, generic.ListView):
return reverse(view_name)
def get_actions(self):
return self.model_admin.get_actions()
return self.model_admin.get_list_actions()
class ModelDetailView(AdminModel2Mixin, generic.DetailView):