Django

Code

Changeset 3631

Show
Ignore:
Timestamp:
08/20/06 20:16:26 (2 years ago)
Author:
clong
Message:

[per-object-permissions] Fixed up some comments

Files:

Legend:

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

    r3629 r3631  
    3030    if not request.user.has_perm(opts.app_label + '.' + opts.get_change_permission(), object=model_instance): 
    3131        raise PermissionDenied 
    32     if not request.user.has_perm(RowLevelPermission._meta.app_label + '.' + RowLevelPermission._meta.get_change_permission()): 
     32    if not (request.user.has_perm(RowLevelPermission._meta.app_label + '.' + RowLevelPermission._meta.get_change_permission()) or 
     33            request.user.has_perm(RowLevelPermission._meta.app_label + '.' + RowLevelPermission._meta.get_add_permission())): 
    3334        raise PermissionDenied     
    3435     
     
    4142    })    
    4243 
     44 
     45    #Set up the paging 
    4346    list_per_page = RowLevelPermission._meta.admin.list_per_page 
    4447    paginator = ObjectPaginator(model_instance.row_level_permissions.order_by('owner_ct', 'owner_id'), 
     
    6871    edit_rlp_manip = ChangeRLPManipulator(model_ct) 
    6972    new_rlp_form = forms.FormWrapper(add_rlp_manip, rlp_new_data, rlp_errors) 
    70      
     73    #3 different groups of forms when split by owner 
    7174    user_rlp_form_list = [] 
    7275    other_rlp_form_list = [] 
     
    8588        else: 
    8689            other_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data, rlp_errors), 'rlp':r}) 
    87      
     90    #Combine together the three kinds  
    8891    rlp_forms = [] 
    8992    if user_rlp_form_list: 
  • django/branches/per-object-permissions/django/contrib/auth/models.py

    r3629 r3631  
    339339 
    340340    def contains_permission(self, perm, model=None): 
     341        """ 
     342        This checks if the user has the given permission for any instance  
     343        of the given model. 
     344        """ 
    341345        if self.has_perm(perm): 
    342346            return True 
  • django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py

    r3619 r3631  
    144144False 
    145145 
    146  
    147146"""