# HG changeset patch # User ymh # Date 1317293695 -7200 # Node ID 74bad93d3cb75bf5afd8c9a98993a42b8780c4c2 # Parent a59dd2aed213f3bbd59a3e829e69e1b87deb76b6# Parent 50dd5c3e8ab8365982cffc4f411f9f5ba7686176 Merge with 50dd5c3e8ab8365982cffc4f411f9f5ba7686176 diff -r 50dd5c3e8ab8 -r 74bad93d3cb7 .settings/org.eclipse.core.resources.prefs diff -r 50dd5c3e8ab8 -r 74bad93d3cb7 .settings/org.eclipse.php.core.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.php.core.prefs Thu Sep 29 12:54:55 2011 +0200 @@ -0,0 +1,3 @@ +#Sat Sep 24 15:42:33 CEST 2011 +eclipse.preferences.version=1 +include_path= diff -r 50dd5c3e8ab8 -r 74bad93d3cb7 src/ldt/ldt/user/models.py --- a/src/ldt/ldt/user/models.py Thu Sep 29 12:39:01 2011 +0200 +++ b/src/ldt/ldt/user/models.py Thu Sep 29 12:54:55 2011 +0200 @@ -1,9 +1,10 @@ +from django.conf import settings from django.contrib import admin -from django.conf import settings +from django.contrib.auth.models import User, UserManager from django.db import models -from django.contrib.auth.models import User, UserManager from django.db.models.signals import post_save import datetime + class Ldt(User): # irigroups = models.ManyToManyField(IriGroup, blank=True) @@ -19,7 +20,7 @@ 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() + now = datetime.datetime.utcnow() new_user = Ldt(None, username, '', '', email.strip().lower(), 'placeholder', False, True, False, now, now) if password: new_user.set_password(password)