git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Smartfire: updated several templates
[myslice.git]
/
portal
/
models.py
diff --git
a/portal/models.py
b/portal/models.py
index
6670c4c
..
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
#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
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()
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)
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)