git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slice-tab-users-view.html
[unfold.git]
/
portal
/
actions.py
diff --git
a/portal/actions.py
b/portal/actions.py
index
e68bd3f
..
e218126
100644
(file)
--- a/
portal/actions.py
+++ b/
portal/actions.py
@@
-36,7
+36,7
@@
def authority_get_pi_emails(request, authority_hrn):
pi_users = authority_get_pis(request,authority_hrn)
print "pi_users = %s" % pi_users
pi_users = authority_get_pis(request,authority_hrn)
print "pi_users = %s" % pi_users
- if any(
d['pi_users'] == None for d
in pi_users):
+ if any(
pi['pi_users'] == None or not pi['pi_users'] for pi
in pi_users):
#theme.template_name = 'email_default_recipients.txt'
#default_email = render_to_string(theme.template, request)
#default_email = default_email.replace('\n', '')
#theme.template_name = 'email_default_recipients.txt'
#default_email = render_to_string(theme.template, request)
#default_email = default_email.replace('\n', '')
@@
-402,7
+402,7
@@
def create_pending_slice(wsgi_request, request, email):
slice_name = request['slice_name'],
user_hrn = request['user_hrn'],
authority_hrn = request['authority_hrn'],
slice_name = request['slice_name'],
user_hrn = request['user_hrn'],
authority_hrn = request['authority_hrn'],
- number_of_nodes = request['
number_of_nodes
'],
+ number_of_nodes = request['
exp_url
'],
purpose = request['purpose'],
)
s.save()
purpose = request['purpose'],
)
s.save()
@@
-608,7
+608,7
@@
def create_pending_user(wsgi_request, request, user_detail):
theme.template_name = 'user_request_email.html'
html_content = render_to_string(theme.template, request)
theme.template_name = 'user_request_email.html'
html_content = render_to_string(theme.template, request)
-
+
theme.template_name = 'user_request_email.txt'
text_content = render_to_string(theme.template, request)
theme.template_name = 'user_request_email.txt'
text_content = render_to_string(theme.template, request)