From aef05822d03fe0fb32be44d6bae27ee1e329d52a Mon Sep 17 00:00:00 2001 From: Christopher Long Date: Mon, 4 Sep 2006 16:59:09 +0000 Subject: [PATCH] [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 --- django/contrib/admin/row_level_perm_manipulator.py | 8 ++++---- 1 file 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)