Changeset 3731
- Timestamp:
- 09/06/06 20:28:37 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/per-object-permissions/django/contrib/admin/views/row_level_permissions.py
r3656 r3731 6 6 from django.contrib.auth.models import RowLevelPermission, User, Group 7 7 from django.db import models 8 from django.contrib.admin.row_level_perm_manipulator import AddRLPManipulator, ChangeRLPManipulator 8 from django.contrib.admin.row_level_perm_manipulator import AddRLPManipulator, ChangeRLPManipulator, MultipleObjSelectField 9 9 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied 10 10 from django.core.paginator import ObjectPaginator, InvalidPage … … 79 79 user_ct = model_ct = ContentType.objects.get_for_model(User) 80 80 for r in rlp_list: 81 owner_val = str(r.owner_ct)+"-"+str(r.owner_id)81 owner_val = MultipleObjSelectField.returnKey(r.owner, r.owner_ct) 82 82 data = {'id':r.id, 'owner':owner_val, 'perm':r.permission.id, 'negative':r.negative} 83 83 84 if r.owner_ct.id isuser_ct.id:84 if r.owner_ct.id == user_ct.id: 85 85 user_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data, rlp_errors), 'rlp':r}) 86 elif r.owner_ct.id isgroup_ct.id:86 elif r.owner_ct.id == group_ct.id: 87 87 group_rlp_form_list.append({'form':forms.FormWrapper(edit_rlp_manip, data, rlp_errors), 'rlp':r}) 88 88 else:
