diff options
| author | Christopher Long <indirecthit@gmail.com> | 2006-09-04 16:59:09 +0000 |
|---|---|---|
| committer | Christopher Long <indirecthit@gmail.com> | 2006-09-04 16:59:09 +0000 |
| commit | aef05822d03fe0fb32be44d6bae27ee1e329d52a (patch) | |
| tree | 9e2cee1a3ca8499f4dabe4c7d648d253ec13c274 | |
| parent | ea2a514f5cdbc15f8c26e91f827339d3eb36d12a (diff) | |
| download | django-aef05822d03fe0fb32be44d6bae27ee1e329d52a.tar.gz | |
[per-object-permissions] Fixes #2652, modified the form field to include the app label in the select field (the elements of which are now separated by a /)
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/row_level_perm_manipulator.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/row_level_perm_manipulator.py b/django/contrib/admin/row_level_perm_manipulator.py index 885ba2dd58..bfe8362d60 100644 --- a/django/contrib/admin/row_level_perm_manipulator.py +++ b/django/contrib/admin/row_level_perm_manipulator.py @@ -143,15 +143,15 @@ class MultipleObjSelectField(forms.SelectField): return '\n'.join(output) def returnObject(data): - data = data.split('-') - ct = ContentType.objects.get(model__exact=data[0]) - obj = ct.get_object_for_this_type(pk=data[1]) + data = data.split('/') + ct = ContentType.objects.get(app_label__exact=data[0], model__exact=data[1]) + obj = ct.get_object_for_this_type(pk=data[2]) return obj def returnKey(obj, ct=None): if not ct: ct = ContentType.objects.get_for_model(obj.__class__) - return ct.model+"-"+str(obj.id) + return ct.app_label+"/"+ct.model+"/"+str(obj.id) returnObject = staticmethod(returnObject) returnKey = staticmethod(returnKey) |