Author: clong
Date: 2006-08-20 20:16:26 -0500 (Sun, 20 Aug 2006)
New Revision: 3631
Modified:
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
django/branches/per-object-permissions/django/contrib/auth/models.py
django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py
Log:
[per-object-permissions] Fixed up some comments
Modified:
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
===================================================================
---
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
2006-08-20 22:49:48 UTC (rev 3630)
+++
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
2006-08-21 01:16:26 UTC (rev 3631)
@@ -29,7 +29,8 @@
if not request.user.has_perm(opts.app_label + '.' +
opts.get_change_permission(), object=model_instance):
raise PermissionDenied
- if not request.user.has_perm(RowLevelPermission._meta.app_label + '.' +
RowLevelPermission._meta.get_change_permission()):
+ if not (request.user.has_perm(RowLevelPermission._meta.app_label + '.' +
RowLevelPermission._meta.get_change_permission()) or
+ request.user.has_perm(RowLevelPermission._meta.app_label + '.' +
RowLevelPermission._meta.get_add_permission())):
raise PermissionDenied
c = template.RequestContext(request, {
@@ -40,6 +41,8 @@
'opts':opts,
})
+
+ #Set up the paging
list_per_page = RowLevelPermission._meta.admin.list_per_page
paginator =
ObjectPaginator(model_instance.row_level_permissions.order_by('owner_ct',
'owner_id'),
list_per_page)
@@ -67,7 +70,7 @@
add_rlp_manip = AddRLPManipulator(model_instance, model_ct)
edit_rlp_manip = ChangeRLPManipulator(model_ct)
new_rlp_form = forms.FormWrapper(add_rlp_manip, rlp_new_data, rlp_errors)
-
+ #3 different groups of forms when split by owner
user_rlp_form_list = []
other_rlp_form_list = []
group_rlp_form_list = []
@@ -84,7 +87,7 @@
group_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data,
rlp_errors), 'rlp':r})
else:
other_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data,
rlp_errors), 'rlp':r})
-
+ #Combine together the three kinds
rlp_forms = []
if user_rlp_form_list:
rlp_forms.append((_('Users'), user_rlp_form_list,))
Modified: django/branches/per-object-permissions/django/contrib/auth/models.py
===================================================================
--- django/branches/per-object-permissions/django/contrib/auth/models.py
2006-08-20 22:49:48 UTC (rev 3630)
+++ django/branches/per-object-permissions/django/contrib/auth/models.py
2006-08-21 01:16:26 UTC (rev 3631)
@@ -338,6 +338,10 @@
return True
def contains_permission(self, perm, model=None):
+ """
+ This checks if the user has the given permission for any instance
+ of the given model.
+ """
if self.has_perm(perm):
return True
if model and model._meta.row_level_permissions:
Modified:
django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py
===================================================================
---
django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py
2006-08-20 22:49:48 UTC (rev 3630)
+++
django/branches/per-object-permissions/tests/modeltests/row_level_permissions/models.py
2006-08-21 01:16:26 UTC (rev 3631)
@@ -143,5 +143,4 @@
>>> user.has_perm(quartz._meta.app_label +"."+ perm.codename, quartz)
False
-
"""
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
