Author: clong
Date: 2006-09-06 20:28:37 -0500 (Wed, 06 Sep 2006)
New Revision: 3731
Modified:
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
Log:
[per-object-permissions] Fixes #2664 and #2663
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-09-05 16:36:44 UTC (rev 3730)
+++
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
2006-09-07 01:28:37 UTC (rev 3731)
@@ -5,7 +5,7 @@
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import RowLevelPermission, User, Group
from django.db import models
-from django.contrib.admin.row_level_perm_manipulator import AddRLPManipulator,
ChangeRLPManipulator
+from django.contrib.admin.row_level_perm_manipulator import AddRLPManipulator,
ChangeRLPManipulator, MultipleObjSelectField
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist,
PermissionDenied
from django.core.paginator import ObjectPaginator, InvalidPage
from django.contrib.admin.views.main import unquote, quote
@@ -78,12 +78,12 @@
group_ct = model_ct = ContentType.objects.get_for_model(Group)
user_ct = model_ct = ContentType.objects.get_for_model(User)
for r in rlp_list:
- owner_val = str(r.owner_ct)+"-"+str(r.owner_id)
+ owner_val = MultipleObjSelectField.returnKey(r.owner, r.owner_ct)
data = {'id':r.id, 'owner':owner_val, 'perm':r.permission.id,
'negative':r.negative}
- if r.owner_ct.id is user_ct.id:
+ if r.owner_ct.id == user_ct.id:
user_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data,
rlp_errors), 'rlp':r})
- elif r.owner_ct.id is group_ct.id:
+ elif r.owner_ct.id == group_ct.id:
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})
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
