Django

Code

Show
Ignore:
Timestamp:
07/18/08 18:54:34 (6 months ago)
Author:
brosner
Message:

Merged the newforms-admin branch into trunk.

This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets?
and Media definitions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7806 r7967  
    9292    """ 
    9393    name = models.CharField(_('name'), max_length=80, unique=True) 
    94     permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True, filter_interface=models.HORIZONTAL) 
     94    permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True) 
    9595 
    9696    class Meta: 
    9797        verbose_name = _('group') 
    9898        verbose_name_plural = _('groups') 
    99  
    100     class Admin: 
    101         search_fields = ('name',) 
    102         ordering = ('name',) 
    103  
     99         
    104100    def __unicode__(self): 
    105101        return self.name 
    …… 
    148144    groups = models.ManyToManyField(Group, verbose_name=_('groups'), blank=True, 
    149145        help_text=_("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in.")) 
    150     user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True, filter_interface=models.HORIZONTAL) 
     146    user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True) 
    151147    objects = UserManager() 
    152148 
    …… 
    154150        verbose_name = _('user') 
    155151        verbose_name_plural = _('users') 
    156  
    157     class Admin: 
    158         fields = ( 
    159             (None, {'fields': ('username', 'password')}), 
    160             (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}), 
    161             (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}), 
    162             (_('Important dates'), {'fields': ('last_login', 'date_joined')}), 
    163             (_('Groups'), {'fields': ('groups',)}), 
    164         ) 
    165         list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff') 
    166         list_filter = ('is_staff', 'is_superuser') 
    167         search_fields = ('username', 'first_name', 'last_name', 'email') 
    168         ordering = ('username',) 
    169  
     152         
    170153    def __unicode__(self): 
    171154        return self.username