X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmodels.py;h=61feba3ce4364c5fb8ab373fd6bd0cb8630d496d;hb=d4eab587e0832c9411f967dcb280761f9dacc87b;hp=3c950a6fd6a350bd43c86816f1f6b1d5b123b45a;hpb=7fffd547ac72989d431284a4720eb91233c6162a;p=myslice.git

diff --git a/portal/models.py b/portal/models.py
index 3c950a6f..61feba3c 100644
--- a/portal/models.py
+++ b/portal/models.py
@@ -20,9 +20,32 @@
 # this program; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-from django.db import models
-from .validators import validate_email
+import datetime
+import hashlib
+import random
+import re
 
+from django.conf              import settings
+from django.core.mail         import send_mail
+from django.db                import models
+from django.db                import transaction
+from django.utils.translation import ugettext_lazy as _
+from django.template.loader   import render_to_string
+
+#from django.core.validators import validate_email
+
+try:
+    from django.contrib.auth import get_user_model
+    User = get_user_model()
+except ImportError:
+    from django.contrib.auth.models import User
+
+try:
+    from django.utils.timezone import now as datetime_now
+except ImportError:
+    datetime_now = datetime.datetime.now
+
+SHA1_RE = re.compile('^[a-f0-9]{40}$')
 
 # Create your models here.
 
@@ -35,10 +58,17 @@ class PendingUser(models.Model):
     # simplify form creation in forms.py
     first_name  = models.TextField()
     last_name   = models.TextField()
-    email       = models.EmailField(validators=[validate_email])
+#    affiliation = models.TextField()
+    email       = models.EmailField() #validators=[validate_email])
     password    = models.TextField()
     keypair     = models.TextField()
     # institution
+    authority_hrn = models.TextField()
+    # models.ForeignKey(Institution)
 
 class PendingSlice(models.Model):
-    slice_name  = models.TextField()
+    slice_name      = models.TextField()
+    authority_hrn   = models.TextField(null=True)
+    number_of_nodes = models.TextField(default=0)
+    type_of_nodes   = models.TextField(default='NA')
+    purpose         = models.TextField(default='NA')