Django

Code

Changeset 3619

Show
Ignore:
Timestamp:
08/19/06 19:13:46 (2 years ago)
Author:
clong
Message:

[per-object-permissions] Minor fixes to admin RLP views
[per-object-permissions] Removed test failing due to cache problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py

    r3617 r3619  
    3030        raise PermissionDenied     
    3131     
    32  
    33  
    3432    c = template.RequestContext(request, { 
    3533        'title': _('Edit Row Level Permissions'), 
    …… 
    4139 
    4240     
    43     #TODO: For now takes the number per page from the model instance not the RLP object 
    4441    list_per_page = opts.admin.list_per_page 
    45     #list_per_page = 5 
     42    #list_per_page = 20 
    4643    paginator = ObjectPaginator(model_instance.row_level_permissions.order_by('owner_ct', 'owner_id'), 
    4744                                list_per_page) 
    …… 
    133130    request.user.message_set.create(message=msg['text']) 
    134131 
    135     return HttpResponseRedirect("../../../../") 
     132    return HttpResponseRedirect(request.META["HTTP_REFERER"]) 
    136133#    return HttpResponseRedirect("%s?rlp_result=%s&rlp_msg=%s" % (request.META["HTTP_REFERER"], str(msg["result"]), main.quote(msg["text"]))) 
    137134    #return main.change_stage(request, main.quote(obj._meta.app_label), main.quote(obj._meta.object_name), 
    …… 
    185182    #return main.change_stage(request, main.quote(obj._meta.app_label), main.quote(obj._meta.object_name), 
    186183    #                    main.quote(str(obj.id)), extra_context={"row_level_perm_msg":msg,}) 
    187     return HttpResponseRedirect("../") 
     184    if msg["result"]: 
     185        request.user.message_set.create(message=msg['text'])  
     186        return HttpResponseRedirect(request.META["HTTP_REFERER"]) 
     187    else: 
     188        return HttpResponseRedirect("../?err_msg=%s" % msg['text']) 
    188189add_row_level_permission = staff_member_required(never_cache(add_row_level_permission)) 
    189190 
    …… 
    232233         
    233234    request.user.message_set.create(message=msg['text'])  
    234   
    235     return HttpResponseRedirect("../../../../") 
     235    return HttpResponseRedirect(request.META["HTTP_REFERER"]) 
    236236#    request.POST = {} 
    237237#    return change_stage(request, main.quote(obj._meta.app_label), main.quote(obj._meta.object_name), 

  • django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py

    r3533 r3619  
    117117>>> user.user_permissions.all() 
    118118[<Permission: mineral | Can change>] 
    119 >>> user.has_perm(quartz._meta.app_label +"."+ perm2.codename, quartz) 
    120 True 
    121119>>> rlp2 = RowLevelPermission.objects.create_row_level_permission(quartz, user, perm2, negative=True) 
    122120>>> user.has_perm(quartz._meta.app_label +"."+ perm2.codename, quartz)