X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fmodels.py;h=9ffff60f0feb0a1807c3efdedd495def8533687d;hb=deee82377a1f72626cede01fdfec5e9d7cc274ce;hp=6670c4c0e1bb7173739b04dcdcc96ea442d653f0;hpb=5c6d3dfae3a4aed1a18a9f1a946655631328351d;p=myslice.git

diff --git a/portal/models.py b/portal/models.py
index 6670c4c0..9ffff60f 100644
--- a/portal/models.py
+++ b/portal/models.py
@@ -33,11 +33,11 @@ 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.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
@@ -100,6 +100,14 @@ class PendingSlice(models.Model):
 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)