Changeset 3631
- Timestamp:
- 08/20/06 20:16:26 (2 years ago)
- Files:
-
- django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py (modified) (4 diffs)
- django/branches/per-object-permissions/django/contrib/auth/models.py (modified) (1 diff)
- django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
r3629 r3631 30 30 if not request.user.has_perm(opts.app_label + '.' + opts.get_change_permission(), object=model_instance): 31 31 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())): 33 34 raise PermissionDenied 34 35 … … 41 42 }) 42 43 44 45 #Set up the paging 43 46 list_per_page = RowLevelPermission._meta.admin.list_per_page 44 47 paginator = ObjectPaginator(model_instance.row_level_permissions.order_by('owner_ct', 'owner_id'), … … 68 71 edit_rlp_manip = ChangeRLPManipulator(model_ct) 69 72 new_rlp_form = forms.FormWrapper(add_rlp_manip, rlp_new_data, rlp_errors) 70 73 #3 different groups of forms when split by owner 71 74 user_rlp_form_list = [] 72 75 other_rlp_form_list = [] … … 85 88 else: 86 89 other_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data, rlp_errors), 'rlp':r}) 87 90 #Combine together the three kinds 88 91 rlp_forms = [] 89 92 if user_rlp_form_list: django/branches/per-object-permissions/django/contrib/auth/models.py
r3629 r3631 339 339 340 340 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 """ 341 345 if self.has_perm(perm): 342 346 return True django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py
r3619 r3631 144 144 False 145 145 146 147 146 """
