# HG changeset patch # User verrierj # Date 1314279672 -7200 # Node ID 73ce005c4727e6833c1f409c2ae5cd68cf25a6ac # Parent 2f83bcf58cc14f4465c5368eeb37b39dcd7901f7 Changed name of class user.models.ldt to user.Ldt diff -r 2f83bcf58cc1 -r 73ce005c4727 src/ldt/ldt/management/__init__.py --- a/src/ldt/ldt/management/__init__.py Thu Aug 25 14:28:56 2011 +0200 +++ b/src/ldt/ldt/management/__init__.py Thu Aug 25 15:41:12 2011 +0200 @@ -3,13 +3,13 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.db.models import signals -from ldt.user.models import ldt +from ldt.user.models import Ldt def post_save_ldt(instance, raw, created, **kwargs): signals.post_save.send(sender=User, instance=instance, raw=raw, created=created) -signals.post_save.connect(post_save_ldt, ldt) +signals.post_save.connect(post_save_ldt, Ldt) def post_save_user(instance, raw, created, **kwargs): if created: diff -r 2f83bcf58cc1 -r 73ce005c4727 src/ldt/ldt/user/admin.py --- a/src/ldt/ldt/user/admin.py Thu Aug 25 14:28:56 2011 +0200 +++ b/src/ldt/ldt/user/admin.py Thu Aug 25 15:41:12 2011 +0200 @@ -3,7 +3,7 @@ from django.contrib.auth.admin import UserAdmin from django.utils.translation import ugettext as _ from forms import ldtForm -from models import ldt +from models import Ldt class ldtAdmin(UserAdmin): list_display = ('username', 'email', 'first_name', 'last_name') @@ -15,7 +15,7 @@ (_('Permissions'), {'fields': ('is_staff', 'user_permissions')}), ] form = ldtForm - model = ldt + model = Ldt filter_horizontal = ('user_permissions',) def get_fieldsets(self, request, obj=None): @@ -28,5 +28,5 @@ def add_view(self, request): return super(UserAdmin, self).add_view(request) -admin.site.unregister(ldt) -admin.site.register(ldt, ldtAdmin) +admin.site.unregister(Ldt) +admin.site.register(Ldt, ldtAdmin) diff -r 2f83bcf58cc1 -r 73ce005c4727 src/ldt/ldt/user/forms.py --- a/src/ldt/ldt/user/forms.py Thu Aug 25 14:28:56 2011 +0200 +++ b/src/ldt/ldt/user/forms.py Thu Aug 25 15:41:12 2011 +0200 @@ -2,13 +2,13 @@ from django.contrib.auth.forms import UserCreationForm from django.forms.util import ErrorList from django.utils.translation import gettext as _ -from models import ldt +from models import Ldt class ldtForm(UserCreationForm): class Meta: - model = ldt + model = Ldt def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList, label_suffix=':', diff -r 2f83bcf58cc1 -r 73ce005c4727 src/ldt/ldt/user/models.py --- a/src/ldt/ldt/user/models.py Thu Aug 25 14:28:56 2011 +0200 +++ b/src/ldt/ldt/user/models.py Thu Aug 25 15:41:12 2011 +0200 @@ -3,7 +3,7 @@ import datetime -class ldt(User): +class Ldt(User): # irigroups = models.ManyToManyField(IriGroup, blank=True) class Meta: @@ -14,11 +14,11 @@ return self.username -class ldtManager(UserManager): +class LdtManager(UserManager): def create_user(self, username, email, password=None): "Creates and saves a User with the given username, e-mail and password." now = datetime.datetime.now() - user = ldt(None, username, '', '', email.strip().lower(), 'placeholder', False, True, False, now, now) + user = Ldt(None, username, '', '', email.strip().lower(), 'placeholder', False, True, False, now, now) if password: user.set_password(password) else: @@ -26,7 +26,7 @@ user.save() return user -User.objects = ldtManager() +User.objects = LdtManager() User.objects.contribute_to_class(User, "objects") -admin.site.register(ldt) +admin.site.register(Ldt)