mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Fixed #5447. has_X_permission now works correctly.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2007-12-01 18:25:51 +00:00
parent 31e9b26d45
commit b897adb8a4
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/contrib/admin/options.py
View File

@ -276,7 +276,7 @@ class ModelAdmin(BaseModelAdmin):
opts = self.opts opts = self.opts
return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission()) return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission())
def has_change_permission(self, request, obj): def has_change_permission(self, request, obj=None):
""" """
Returns True if the given request has permission to change the given Returns True if the given request has permission to change the given
Django model instance. Django model instance.
@ -287,7 +287,7 @@ class ModelAdmin(BaseModelAdmin):
opts = self.opts opts = self.opts
return request.user.has_perm(opts.app_label + '.' + opts.get_change_permission()) return request.user.has_perm(opts.app_label + '.' + opts.get_change_permission())
def has_delete_permission(self, request, obj): def has_delete_permission(self, request, obj=None):
""" """
Returns True if the given request has permission to change the given Returns True if the given request has permission to change the given
Django model instance. Django model instance.
@ -452,15 +452,16 @@ class ModelAdmin(BaseModelAdmin):
request.user.message_set.create(message=msg) request.user.message_set.create(message=msg)
return HttpResponseRedirect("../") return HttpResponseRedirect("../")
def render_change_form(self, model, context, add=False, change=False, form_url=''): def render_change_form(self, request, model, context, add=False, change=False, form_url='', obj=None):
opts = model._meta opts = model._meta
app_label = opts.app_label app_label = opts.app_label
ordered_objects = opts.get_ordered_objects() ordered_objects = opts.get_ordered_objects()
extra_context = { extra_context = {
'add': add, 'add': add,
'change': change, 'change': change,
'has_delete_permission': context['perms'][app_label][opts.get_delete_permission()], 'has_add_permission': self.has_add_permission(request),
'has_change_permission': context['perms'][app_label][opts.get_change_permission()], 'has_change_permission': self.has_change_permission(request, obj),
'has_delete_permission': self.has_delete_permission(request, obj),
'has_file_field': True, # FIXME - this should check if form or formsets have a FileField, 'has_file_field': True, # FIXME - this should check if form or formsets have a FileField,
'has_absolute_url': hasattr(model, 'get_absolute_url'), 'has_absolute_url': hasattr(model, 'get_absolute_url'),
'ordered_objects': ordered_objects, 'ordered_objects': ordered_objects,
@ -525,8 +526,8 @@ class ModelAdmin(BaseModelAdmin):
'media': mark_safe(media), 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
}) })
return self.render_change_form(model, c, add=True) return self.render_change_form(request, model, c, add=True)
def change_view(self, request, object_id): def change_view(self, request, object_id):
"The 'change' admin view for this model." "The 'change' admin view for this model."
model = self.model model = self.model
@ -600,7 +601,7 @@ class ModelAdmin(BaseModelAdmin):
'media': mark_safe(media), 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
}) })
return self.render_change_form(model, c, change=True) return self.render_change_form(request, model, c, change=True, obj=obj)
def changelist_view(self, request): def changelist_view(self, request):
"The 'change list' admin view for this model." "The 'change list' admin view for this model."
@ -626,7 +627,7 @@ class ModelAdmin(BaseModelAdmin):
'is_popup': cl.is_popup, 'is_popup': cl.is_popup,
'cl': cl, 'cl': cl,
}) })
c.update({'has_add_permission': c['perms'][app_label][opts.get_add_permission()]}), c.update({'has_add_permission': self.has_add_permission(request)}),
return render_to_response(['admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()), return render_to_response(['admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
'admin/%s/change_list.html' % app_label, 'admin/%s/change_list.html' % app_label,
'admin/change_list.html'], context_instance=c) 'admin/change_list.html'], context_instance=c)

6
django/contrib/admin/sites.py
View File

@ -263,9 +263,9 @@ class AdminSite(object):
if has_module_perms: if has_module_perms:
perms = { perms = {
'add': user.has_perm("%s.%s" % (app_label, model._meta.get_add_permission())), 'add': model_admin.has_add_permission(request),
'change': user.has_perm("%s.%s" % (app_label, model._meta.get_change_permission())), 'change': model_admin.has_change_permission(request),
'delete': user.has_perm("%s.%s" % (app_label, model._meta.get_delete_permission())), 'delete': model_admin.has_delete_permission(request),
} }
# Check whether user has any perm for this module. # Check whether user has any perm for this module.

3
django/contrib/admin/templatetags/admin_modify.py
View File

@ -29,7 +29,8 @@ def submit_row(context):
'show_delete_link': (not is_popup and context['has_delete_permission'] 'show_delete_link': (not is_popup and context['has_delete_permission']
and (change or context['show_delete'])), and (change or context['show_delete'])),
'show_save_as_new': not is_popup and change and save_as, 'show_save_as_new': not is_popup and change and save_as,
'show_save_and_add_another': not is_popup and (not save_as or context['add']), 'show_save_and_add_another': context['has_add_permission'] and
not is_popup and (not save_as or context['add']),
'show_save_and_continue': not is_popup and context['has_change_permission'], 'show_save_and_continue': not is_popup and context['has_change_permission'],
'show_save': True 'show_save': True
} }