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

[per-object-permissions] Rewrote urls for row level permission views to take the ajax parameter as a GET instead of a addition to the URL

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Christopher Long 2006-08-07 17:30:27 +00:00
parent b68a6ae701
commit 759f426f24
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,9 @@ urlpatterns = patterns('',
('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'), ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'),
#Row level permissions #Row level permissions
('^auth/row_level_permission/(?P<ct_id>\d+)/(?P<rlp_id>\d+)/(?P<hash>\w+)/delete/(?P<ajax>.*)$', 'django.contrib.admin.views.row_level_permissions.delete_row_level_permission'), ('^auth/row_level_permission/(?P<ct_id>\d+)/(?P<rlp_id>\d+)/(?P<hash>\w+)/delete/$', 'django.contrib.admin.views.row_level_permissions.delete_row_level_permission'),
('^auth/row_level_permission/(?P<ct_id>\d+)/(?P<rlp_id>\d+)/(?P<hash>\w+)/change/(?P<ajax>.*)$', 'django.contrib.admin.views.row_level_permissions.change_row_level_permission'), ('^auth/row_level_permission/(?P<ct_id>\d+)/(?P<rlp_id>\d+)/(?P<hash>\w+)/change/$', 'django.contrib.admin.views.row_level_permissions.change_row_level_permission'),
('^auth/row_level_permission/add/(?P<ct_id>\d+)/(?P<obj_id>\d+)/(?P<ajax>.*)$', 'django.contrib.admin.views.row_level_permissions.add_row_level_permission'), ('^auth/row_level_permission/add/(?P<ct_id>\d+)/(?P<obj_id>\d+)/$', 'django.contrib.admin.views.row_level_permissions.add_row_level_permission'),
# Add/change/delete/history # Add/change/delete/history
('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'), ('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'),

9
django/contrib/admin/views/row_level_permissions.py
View File

@ -7,8 +7,9 @@ from django.contrib.admin.row_level_perm_manipulator import AddRLPManipulator, C
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
import simplejson import simplejson
def delete_row_level_permission(request, ct_id, rlp_id, hash, ajax=None): def delete_row_level_permission(request, ct_id, rlp_id, hash):
msg = {} msg = {}
ajax = request.GET.has_key("ajax")
if utils.verify_objref_hash(ct_id, rlp_id, hash): if utils.verify_objref_hash(ct_id, rlp_id, hash):
rlp = get_object_or_404(RowLevelPermission, pk=rlp_id) rlp = get_object_or_404(RowLevelPermission, pk=rlp_id)
ct = rlp.model_ct ct = rlp.model_ct
@ -28,8 +29,9 @@ def delete_row_level_permission(request, ct_id, rlp_id, hash, ajax=None):
#return HttpResponseRedirect("/edit/%s/%s" % (ct.model, obj.id)) #return HttpResponseRedirect("/edit/%s/%s" % (ct.model, obj.id))
return HttpResponseRedirect("../../../../../../%s/%s/%s" % (obj._meta.app_label, obj._meta.module_name , str(obj.id))) return HttpResponseRedirect("../../../../../../%s/%s/%s" % (obj._meta.app_label, obj._meta.module_name , str(obj.id)))
def add_row_level_permission(request, ct_id, obj_id, ajax=None): def add_row_level_permission(request, ct_id, obj_id):
msg = {} msg = {}
ajax = request.GET.has_key("ajax")
if not request.POST: if not request.POST:
msg = { 'result':False, 'text': _("Only POSTs are allowed" )} msg = { 'result':False, 'text': _("Only POSTs are allowed" )}
if ajax: if ajax:
@ -73,8 +75,9 @@ def add_row_level_permission(request, ct_id, obj_id, ajax=None):
msg["results"]=resp_list msg["results"]=resp_list
return HttpResponse(simplejson.dumps(msg), 'text/javascript') return HttpResponse(simplejson.dumps(msg), 'text/javascript')
def change_row_level_permission(request, ct_id, rlp_id, hash, ajax=None): def change_row_level_permission(request, ct_id, rlp_id, hash):
msg = {} msg = {}
ajax = request.GET.has_key("ajax")
if not request.POST: if not request.POST:
msg = { 'result':False, 'text': _("Only POSTs are allowed" )} msg = { 'result':False, 'text': _("Only POSTs are allowed" )}