X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmodels.py;h=f578d934b8155a66d59efc2f45aca63c7dfcc748;hb=012e4fea839c48e95dc8a174c256494f9b596537;hp=0de4ce09677c1c3b4cc3680d7dacfb45759367f9;hpb=db29e23d289c0edd696b8c6445765a908d59058c;p=unfold.git

diff --git a/portal/models.py b/portal/models.py
index 0de4ce09..f578d934 100644
--- a/portal/models.py
+++ b/portal/models.py
@@ -26,7 +26,6 @@ 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 _
@@ -60,9 +59,14 @@ class PendingUser(models.Model):
     last_name     = models.TextField()
     email         = models.EmailField() #validators=[validate_email])
     password      = models.TextField()
-    keypair       = models.TextField()
+    user_hrn      = models.TextField()
+    public_key    = models.TextField()
+    private_key   = models.TextField()
     authority_hrn = models.TextField()
     login         = models.TextField()
+    pi            = models.TextField()
+    email_hash    = models.TextField()
+    status        = models.TextField()  
     created       = models.DateTimeField(auto_now_add = True)
     # models.ForeignKey(Institution)
 
@@ -80,13 +84,30 @@ class PendingAuthority(models.Model):
     address_postalcode    = models.TextField()
     address_state         = models.TextField()
     address_country       = models.TextField()
+    # parent authority of the requested authority
+    authority_hrn         = models.TextField()
     created               = models.DateTimeField(auto_now_add = True)
  
 class PendingSlice(models.Model):
     slice_name      = models.TextField()
-    user_email      = models.TextField()
+    user_hrn        = 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')
     created         = models.DateTimeField(auto_now_add = True)
+    
+class PendingProject(models.Model):
+    project_name    = models.TextField()
+    user_hrn        = models.TextField()
+    email           = models.TextField()
+    authority_hrn   = models.TextField(null=True)
+    purpose         = models.TextField(default='NA')
+    created         = models.DateTimeField(auto_now_add = True)
+
+class PendingJoin(models.Model):
+    user_hrn        = models.TextField()
+    email           = models.TextField()
+    project_name    = models.TextField(null=True)
+    authority_hrn   = models.TextField()
+    created         = models.DateTimeField(auto_now_add = True)