Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-16 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin

Browse source 
rename modeladmin to model_admin fixes #91
This commit is contained in:
Daniel Greenfeld 2013-05-19 07:30:40 -07:00
commit 0859342ae4
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
djadmin2/apiviews.py
View file

@ -25,7 +25,7 @@ class Admin2APIMixin(Admin2Mixin):
# about the name of the admin instance when declaring the
# Admin2APISerializer base class
_default_view_name = ':'.join((
self.modeladmin.admin.name,
self.model_admin.admin.name,
'%(app_label)s_%(model_name)s_api-detail'))
class Meta:
@ -40,9 +40,9 @@ class IndexAPIView(Admin2APIMixin, APIView):
registry = None
def get_model_data(self, model):
modeladmin = self.registry[model]
model_admin = self.registry[model]
opts = {
'current_app': modeladmin.admin.name,
'current_app': model_admin.admin.name,
'app_label': model._meta.app_label,
'model_name': model._meta.object_name.lower(),
}

16
djadmin2/core.py
View file

@ -25,13 +25,13 @@ class Admin2(object):
self.apps = {}
self.name = name
def register(self, model, modeladmin=None, **kwargs):
def register(self, model, model_admin=None, **kwargs):
"""
Registers the given model with the given admin class. Once a model is
registered in self.registry, we also add it to app registries in
self.apps.
If no modeladmin is passed, it will use ModelAdmin2. If keyword
If no model_admin is passed, it will use ModelAdmin2. If keyword
arguments are given they will be passed to the admin class on
instantiation.
@ -41,9 +41,9 @@ class Admin2(object):
"""
if model in self.registry:
raise ImproperlyConfigured('%s is already registered in django-admin2' % model)
if not modeladmin:
modeladmin = models.ModelAdmin2
self.registry[model] = modeladmin(model, admin=self, **kwargs)
if not model_admin:
model_admin = models.ModelAdmin2
self.registry[model] = model_admin(model, admin=self, **kwargs)
# Add the model to the apps registry
app_label = model._meta.app_label
@ -106,16 +106,16 @@ class Admin2(object):
url(r'^api/v0/$',
self.api_index_view.as_view(**self.get_api_index_kwargs()), name='api-index'),
)
for model, modeladmin in self.registry.iteritems():
for model, model_admin in self.registry.iteritems():
urlpatterns += patterns('',
url('^{}/{}/'.format(
model._meta.app_label,
model._meta.object_name.lower()),
include(modeladmin.urls)),
include(model_admin.urls)),
url('^api/v0/{}/{}/'.format(
model._meta.app_label,
model._meta.object_name.lower()),
include(modeladmin.api_urls)),
include(model_admin.api_urls)),
)
return urlpatterns

2
djadmin2/models.py
View file

@ -131,7 +131,7 @@ class ModelAdmin2(BaseAdmin2):
'app_label': self.app_label,
'model': self.model,
'model_name': self.model_name,
'modeladmin': self,
'model_admin': self,
}
def get_default_api_view_kwargs(self):

12
djadmin2/views.py
View file

@ -13,7 +13,7 @@ ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/boo
class Admin2Mixin(object):
modeladmin = None
model_admin = None
model_name = None
app_label = None
@ -33,13 +33,13 @@ class Admin2Mixin(object):
class AdminModel2Mixin(Admin2Mixin, AccessMixin):
modeladmin = None
model_admin = None
# Permission type to check for when a request is sent to this view.
permission_type = None
def dispatch(self, request, *args, **kwargs):
# Check if user has necessary permissions. If the permission_type isn't specified then check for staff status.
has_permission = self.modeladmin.has_permission(request, self.permission_type) \
has_permission = self.model_admin.has_permission(request, self.permission_type) \
if self.permission_type else request.user.is_staff
# Raise exception or redirect to login if user doesn't have permissions.
if not has_permission:
@ -54,9 +54,9 @@ class AdminModel2Mixin(Admin2Mixin, AccessMixin):
def get_context_data(self, **kwargs):
context = super(AdminModel2Mixin, self).get_context_data(**kwargs)
context.update({
'has_add_permission': self.modeladmin.has_add_permission(self.request),
'has_edit_permission': self.modeladmin.has_edit_permission(self.request),
'has_delete_permission': self.modeladmin.has_delete_permission(self.request),
'has_add_permission': self.model_admin.has_add_permission(self.request),
'has_edit_permission': self.model_admin.has_edit_permission(self.request),
'has_delete_permission': self.model_admin.has_delete_permission(self.request),
})
return context

16
example/blog/tests/test_apiviews.py
View file

@ -31,18 +31,18 @@ class ListCreateAPIViewTest(ViewTest):
def test_response_ok(self):
request = self.factory.get(reverse('admin2:blog_post_api-list'))
modeladmin = self.get_model_admin(Post)
model_admin = self.get_model_admin(Post)
view = apiviews.ListCreateAPIView.as_view(
**modeladmin.get_api_list_kwargs())
**model_admin.get_api_list_kwargs())
response = view(request)
self.assertEqual(response.status_code, 200)
def test_list_includes_unicode_field(self):
Post.objects.create(title='Foo', body='Bar')
request = self.factory.get(reverse('admin2:blog_post_api-list'))
modeladmin = self.get_model_admin(Post)
model_admin = self.get_model_admin(Post)
view = apiviews.ListCreateAPIView.as_view(
**modeladmin.get_api_list_kwargs())
**model_admin.get_api_list_kwargs())
response = view(request)
response.render()
@ -50,9 +50,9 @@ class ListCreateAPIViewTest(ViewTest):
def test_pagination(self):
request = self.factory.get(reverse('admin2:blog_post_api-list'))
modeladmin = self.get_model_admin(Post)
model_admin = self.get_model_admin(Post)
view = apiviews.ListCreateAPIView.as_view(
**modeladmin.get_api_list_kwargs())
**model_admin.get_api_list_kwargs())
response = view(request)
response.render()
data = json.loads(response.content)
@ -72,8 +72,8 @@ class RetrieveUpdateDestroyAPIViewTest(ViewTest):
request = self.factory.get(
reverse('admin2:blog_post_api-detail',
kwargs={'pk': post.pk}))
modeladmin = self.get_model_admin(Post)
model_admin = self.get_model_admin(Post)
view = apiviews.RetrieveUpdateDestroyAPIView.as_view(
**modeladmin.get_api_detail_kwargs())
**model_admin.get_api_detail_kwargs())
response = view(request, pk=post.pk)
self.assertEqual(response.status_code, 200)