Merge with 50dd5c3e8ab8365982cffc4f411f9f5ba7686176
authorymh <ymh.work@gmail.com>
Thu, 29 Sep 2011 12:54:55 +0200
changeset 188 74bad93d3cb7
parent 187 a59dd2aed213 (diff)
parent 186 50dd5c3e8ab8 (current diff)
child 189 08e6b5dbfc93
Merge with 50dd5c3e8ab8365982cffc4f411f9f5ba7686176
.settings/org.eclipse.core.resources.prefs
src/ldt/ldt/user/models.py
src/ldt/ldt/user/templates/ldt/user/change_email.html
--- /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=
--- 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)