Django

Code

Changeset 3534

Show
Ignore:
Timestamp:
08/07/06 12:30:27 (2 years ago)
Author:
clong
Message:

[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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/per-object-permissions/django/contrib/admin/urls.py

    r3486 r3534  
    3030 
    3131    #Row level permissions 
    32     ('^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'), 
    33     ('^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'), 
    34     ('^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'),     
     32    ('^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'), 
     33    ('^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'), 
     34    ('^auth/row_level_permission/add/(?P<ct_id>\d+)/(?P<obj_id>\d+)/$', 'django.contrib.admin.views.row_level_permissions.add_row_level_permission'),     
    3535 
    3636    # Add/change/delete/history 
  • django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py

    r3518 r3534  
    88import simplejson 
    99 
    10 def delete_row_level_permission(request, ct_id, rlp_id, hash, ajax=None): 
     10def delete_row_level_permission(request, ct_id, rlp_id, hash): 
    1111    msg = {} 
     12    ajax = request.GET.has_key("ajax") 
    1213    if utils.verify_objref_hash(ct_id, rlp_id, hash): 
    1314        rlp = get_object_or_404(RowLevelPermission, pk=rlp_id) 
     
    2930    return HttpResponseRedirect("../../../../../../%s/%s/%s" % (obj._meta.app_label, obj._meta.module_name , str(obj.id))) 
    3031 
    31 def add_row_level_permission(request, ct_id, obj_id, ajax=None): 
     32def add_row_level_permission(request, ct_id, obj_id): 
    3233    msg = {} 
     34    ajax = request.GET.has_key("ajax") 
    3335    if not request.POST: 
    3436        msg = { 'result':False, 'text': _("Only POSTs are allowed" )}  
     
    7476    return HttpResponse(simplejson.dumps(msg), 'text/javascript') 
    7577 
    76 def change_row_level_permission(request, ct_id, rlp_id, hash, ajax=None):     
     78def change_row_level_permission(request, ct_id, rlp_id, hash):     
    7779    msg = {} 
     80    ajax = request.GET.has_key("ajax") 
    7881    if not request.POST: 
    7982        msg = { 'result':False, 'text': _("Only POSTs are allowed" )}