Django

Code

Changeset 3716

Show
Ignore:
Timestamp:
09/04/06 11:59:09 (2 years ago)
Author:
clong
Message:

[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 /)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/per-object-permissions/django/contrib/admin/row_level_perm_manipulator.py

    r3623 r3716  
    144144         
    145145    def returnObject(data): 
    146         data = data.split('-') 
    147         ct = ContentType.objects.get(model__exact=data[0]) 
    148         obj = ct.get_object_for_this_type(pk=data[1]) 
     146        data = data.split('/') 
     147        ct = ContentType.objects.get(app_label__exact=data[0], model__exact=data[1]) 
     148        obj = ct.get_object_for_this_type(pk=data[2]) 
    149149        return obj 
    150150 
    …… 
    152152        if not ct: 
    153153            ct = ContentType.objects.get_for_model(obj.__class__) 
    154         return ct.model+"-"+str(obj.id) 
     154        return ct.app_label+"/"+ct.model+"/"+str(obj.id) 
    155155     
    156156    returnObject = staticmethod(returnObject)