[patch] [per-object-permissions] changing perms fails if another app has model called 'user' or 'group'

[mattimustang@…]

My application has a model called Group so editing row level perms fails because the ContentType lookup is not specific enough.

Patch below fixes it.

Index: django/contrib/admin/row_level_perm_manipulator.py
===================================================================
--- django/contrib/admin/row_level_perm_manipulator.py  (revision 3712)
+++ django/contrib/admin/row_level_perm_manipulator.py  (working copy)
@@ -144,7 +144,7 @@
         
     def returnObject(data):
         data = data.split('-')
-        ct = ContentType.objects.get(model__exact=data[0])
+        ct = ContentType.objects.get(app_label='auth', model__exact=data[0])
         obj = ct.get_object_for_this_type(pk=data[1])
         return obj
 
@@ -157,4 +157,4 @@
     returnKey = staticmethod(returnKey)
         
         
-        
\ No newline at end of file
+        

[Chris Long]

(In [3716]) [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 /)