Django

Code

Changeset 3767

Show
Ignore:
Timestamp:
09/17/06 13:32:27 (2 years ago)
Author:
clong
Message:

[per-object-permissions] Fixes bug described in ticket #2749
[per-object-permissions] Fixes the add manipulator so it does not assume the pk attribute is "id"

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3752 r3767  
    7878            field_name_list = ('owner_ct', 'owner_id', 'model_ct', 'model_id', 'permission') 
    7979            field_data = ct.id 
    80             all_data = {'owner_id':owner.id, 'model_ct_id':self.ct.id, 'model_id':self.obj_instance.id, 'permission_id':perm.id} 
     80            model_id = self.obj_instance._get_pk_val()  
     81            all_data = {'owner_id':owner.id, 'model_ct_id':self.ct.id, 'model_id':model_id, 'permission_id':perm.id} 
    8182            manipulators.manipulator_validator_unique_together(field_name_list, self.opts, self, field_data, all_data)             
    8283             

  • django/branches/per-object-permissions/django/db/models/fields/generic.py

    r3134 r3767  
    118118         
    119119    def m2m_reverse_name(self): 
    120         return self.model._meta.pk.attname 
     120        return self.object_id_field_name 
    121121 
    122122    def contribute_to_class(self, cls, name):