X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=e68bd3f4f4cbae13924ad91677d845d44a7caecb;hb=dc5dc68e237f827215ba39b24658b5fa6d7f7ba2;hp=b9a07378b1ed607af4ba4695656273b4e2d9f04d;hpb=d04f3fd85686bee03a961494bdb4a68d6fb07ad4;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index b9a07378..e68bd3f4 100644 --- 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: - 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: @@ -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', '') - 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'])