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
f4f changes
[unfold.git]
/
portal
/
actions.py
diff --git
a/portal/actions.py
b/portal/actions.py
index
b9a0737
..
e68bd3f
100644
(file)
--- a/
portal/actions.py
+++ b/
portal/actions.py
@@
-252,7
+252,8
@@
def get_request_by_id(ids):
def get_requests(authority_hrns=None):
print "get_request_by_authority auth_hrns = ", authority_hrns
if not authority_hrns:
def get_requests(authority_hrns=None):
print "get_request_by_authority auth_hrns = ", authority_hrns
if not authority_hrns:
- pending_users = PendingUser.objects.all()
+ ## get those pending users who have validated their emails
+ pending_users = PendingUser.objects.filter(status__iexact = 'True')
pending_slices = PendingSlice.objects.all()
pending_authorities = PendingAuthority.objects.all()
else:
pending_slices = PendingSlice.objects.all()
pending_authorities = PendingAuthority.objects.all()
else:
@@
-550,7
+551,10
@@
def create_pending_user(wsgi_request, request, user_detail):
theme.template_name = 'activate_user_email_subject.txt'
subject = render_to_string(theme.template, request)
subject = subject.replace('\n', '')
theme.template_name = 'activate_user_email_subject.txt'
subject = render_to_string(theme.template, request)
subject = subject.replace('\n', '')
- sender = 'support@myslice.info'
+ #sender = 'support@myslice.info'
+ theme.template_name = 'email_default_sender.txt'
+ sender = render_to_string(theme.template, request)
+ sender = sender.replace('\n', '')
recipient = [request['email']]
#recipient = recipient.append(request['email'])
recipient = [request['email']]
#recipient = recipient.append(request['email'])