Django

Code

Changeset 3172

Show
Ignore:
Timestamp:
06/19/06 23:44:27 (2 years ago)
Author:
adrian
Message:

Fixed #1802 -- Fixed database integrity error when creating permission objects after renaming a model

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/auth/management.py

    r3148 r3172  
    2626        ctype = ContentType.objects.get_for_model(klass) 
    2727        for codename, name in _get_all_permissions(klass._meta): 
    28             try: 
    29                 Permission.objects.get(name=name, codename=codename, content_type__pk=ctype.id) 
    30             except Permission.DoesNotExist: 
    31                 p = Permission(name=name, codename=codename, content_type=ctype) 
    32                 p.save() 
     28            p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id, 
     29                defaults={'name': name, 'content_type': ctype}) 
     30            if created: 
    3331                print "Adding permission '%s'" % p 
    3432