# HG changeset patch # User verrierj # Date 1314279946 -7200 # Node ID c4b5d188d1110716b80b5526413d60518d649dc2 # Parent 73ce005c4727e6833c1f409c2ae5cd68cf25a6ac Corrected class names in forms #11 diff -r 73ce005c4727 -r c4b5d188d111 src/ldt/ldt/user/admin.py --- a/src/ldt/ldt/user/admin.py Thu Aug 25 15:41:12 2011 +0200 +++ b/src/ldt/ldt/user/admin.py Thu Aug 25 15:45:46 2011 +0200 @@ -2,10 +2,10 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin from django.utils.translation import ugettext as _ -from forms import ldtForm +from forms import LdtForm from models import Ldt -class ldtAdmin(UserAdmin): +class LdtAdmin(UserAdmin): list_display = ('username', 'email', 'first_name', 'last_name') fieldsets = [ @@ -14,7 +14,7 @@ (_('Groups'), {'fields': ('groups',)}), (_('Permissions'), {'fields': ('is_staff', 'user_permissions')}), ] - form = ldtForm + form = LdtForm model = Ldt filter_horizontal = ('user_permissions',) @@ -29,4 +29,4 @@ return super(UserAdmin, self).add_view(request) admin.site.unregister(Ldt) -admin.site.register(Ldt, ldtAdmin) +admin.site.register(Ldt, LdtAdmin) diff -r 73ce005c4727 -r c4b5d188d111 src/ldt/ldt/user/forms.py --- a/src/ldt/ldt/user/forms.py Thu Aug 25 15:41:12 2011 +0200 +++ b/src/ldt/ldt/user/forms.py Thu Aug 25 15:45:46 2011 +0200 @@ -5,7 +5,7 @@ from models import Ldt -class ldtForm(UserCreationForm): +class LdtForm(UserCreationForm): class Meta: model = Ldt @@ -17,7 +17,7 @@ if instance: initial = initial or {} - super(ldtForm, self).__init__(data, files, auto_id, prefix, + super(LdtForm, self).__init__(data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, instance) if instance: @@ -31,17 +31,17 @@ def clean_username(self): if self.instance: return self.cleaned_data['username'] - return super(ldtForm, self).clean_username() + return super(LdtForm, self).clean_username() def clean_password2(self): if self.instance and self.cleaned_data['password1'] == '' and self.cleaned_data['password2'] == '': self._password_change = False return u'' - return super(ldtForm, self).clean_password2() + return super(LdtForm, self).clean_password2() def save(self, commit=True): - Super = self._password_change and ldtForm or UserCreationForm + Super = self._password_change and LdtForm or UserCreationForm user = super(Super, self).save(commit=False) # if user.pk != None: # self.save_m2m()