p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed contrib.admin.views.main to use staff_member_required_decorator. Refs #627. Note that, by this point, AdminUserRequired middleware is redundant -- but nothing is backwards-incompatible yet. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-10-18 05:23:07 +00:00
parent c2ffd62d89
commit d5f32aa008
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/admin/views/main.py
View File

@ -1,5 +1,6 @@
# Generic admin views, with admin templates created dynamically at runtime. # Generic admin views, with admin templates created dynamically at runtime.
from django.contrib.admin.views.decorators import staff_member_required
from django.core import formfields, meta from django.core import formfields, meta
from django.core.template import loader from django.core.template import loader
from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied
@ -49,6 +50,7 @@ def get_query_string(original_params, new_params={}, remove=[]):
def index(request): def index(request):
return render_to_response('index', {'title': 'Site administration'}, context_instance=Context(request)) return render_to_response('index', {'title': 'Site administration'}, context_instance=Context(request))
index = staff_member_required(index)
def change_list(request, app_label, module_name): def change_list(request, app_label, module_name):
from django.core import paginator from django.core import paginator
@ -493,6 +495,7 @@ def change_list(request, app_label, module_name):
'is_popup': is_popup, 'is_popup': is_popup,
}) })
return HttpResponse(t.render(c)) return HttpResponse(t.render(c))
change_list = staff_member_required(change_list)
def _get_flattened_data(field, val): def _get_flattened_data(field, val):
""" """
@ -853,6 +856,7 @@ def add_stage(request, app_label, module_name, show_delete=False, form_url='', p
# return HttpResponse(raw_template, mimetype='text/plain') # return HttpResponse(raw_template, mimetype='text/plain')
t = loader.get_template_from_string(raw_template) t = loader.get_template_from_string(raw_template)
return HttpResponse(t.render(c)) return HttpResponse(t.render(c))
add_stage = staff_member_required(add_stage)
def change_stage(request, app_label, module_name, object_id): def change_stage(request, app_label, module_name, object_id):
mod, opts = _get_mod_opts(app_label, module_name) mod, opts = _get_mod_opts(app_label, module_name)
@ -978,6 +982,7 @@ def change_stage(request, app_label, module_name, object_id):
# return HttpResponse(raw_template, mimetype='text/plain') # return HttpResponse(raw_template, mimetype='text/plain')
t = loader.get_template_from_string(raw_template) t = loader.get_template_from_string(raw_template)
return HttpResponse(t.render(c)) return HttpResponse(t.render(c))
change_stage = staff_member_required(change_stage)
def _nest_help(obj, depth, val): def _nest_help(obj, depth, val):
current = obj current = obj
@ -1089,6 +1094,7 @@ def delete_stage(request, app_label, module_name, object_id):
"deleted_objects": deleted_objects, "deleted_objects": deleted_objects,
"perms_lacking": perms_needed, "perms_lacking": perms_needed,
}, context_instance=Context(request)) }, context_instance=Context(request))
delete_stage = staff_member_required(delete_stage)
def history(request, app_label, module_name, object_id): def history(request, app_label, module_name, object_id):
mod, opts = _get_mod_opts(app_label, module_name) mod, opts = _get_mod_opts(app_label, module_name)
@ -1102,3 +1108,4 @@ def history(request, app_label, module_name, object_id):
'module_name': capfirst(opts.verbose_name_plural), 'module_name': capfirst(opts.verbose_name_plural),
'object': obj, 'object': obj,
}, context_instance=Context(request)) }, context_instance=Context(request))
history = staff_member_required(history)