AiC and REST login

[myslice.git] / portal / models.py

diff --git a/portal/models.py b/portal/models.py
index cc484b5..9ffff60 100644 (file)
--- 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
@@ -96,3 +96,18 @@ class PendingSlice(models.Model):
     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)