X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=b7ee9a0a14c8ee2de4a6206c829bb14e0f2a188c;hb=8cd0d0762c9a12848bbbaa352e1eb0e5f5653743;hp=a6b33a5784451db2b74d02e189bef643cfff273b;hpb=6eb98c83dccb555e576740d8000d6fad8044763f;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index a6b33a57..b7ee9a0a 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -7,14 +7,14 @@ from unfold.page import Page import json from django.contrib.auth.models import User -from django.contrib.sites.models import Site from django.contrib.auth import get_user_model from django.template.loader import render_to_string from django.core.mail import EmailMultiAlternatives, send_mail from myslice.theme import ThemeView from myslice.configengine import ConfigEngine -from myslice.settings import logger + +from myslice.settings import logger theme = ThemeView() @@ -445,7 +445,8 @@ def delete_local_user(wsgi_request, user_email): user_config = json.loads(user[0]['config']) authority_hrn = user_config.get('authority', None) - if is_pi(wsgi_request, '$user_hrn', authority_hrn): + #if is_pi(wsgi_request, '$user_hrn', authority_hrn): + try: # removing from Django auth_user UserModel = get_user_model() UserModel._default_manager.filter(email__iexact = user_email).delete() @@ -455,9 +456,9 @@ def delete_local_user(wsgi_request, user_email): # removing manifold user manifold_delete_user(wsgi_request, user_id) - else: - return False - #raise Exception, "No sufficient rights on authority = ",authority_hrn + except Exception, e: + #return False + print "No sufficient rights on authority = ",authority_hrn return True @@ -677,13 +678,14 @@ def portal_validate_request(wsgi_request, request_ids): a = PendingAuthority.objects.get(id=request['id']) ctx = { 'site_name' : a.site_name, - 'short_name' : a.short_name, - 'url' : a.url, - 'city' : a.city, - 'country' : a.country, - 'portal_url' : a.current_site, + #'short_name' : a.short_name, + #'url' : a.url, + 'city' : a.address_city, + 'country' : a.address_country, + #'portal_url' : a.current_site, } - user_email = a.email + # address_line1 contains the email of the user in pending_authority table + user_email = a.address_line1 PendingAuthority.objects.get(id=request['id']).delete() @@ -741,9 +743,12 @@ def portal_validate_request(wsgi_request, request_ids): raise Exception, 'unknown type of request %s' % request['type'] # XXX Remove from Pendings in database - send_status_email(ctx, user_email, request['type'], 'validated') + send_status_email(wsgi_request, ctx, user_email, request['type'], 'validated') except Exception, e: request_status['SFA '+request['type']] = {'status': False, 'description': str(e)} + logger.error('ERROR - actions.py - portal_validate_request: %s' % e) + import traceback + logger.error(traceback.format_exc()) status['%s__%s' % (request['type'], request['id'])] = request_status @@ -762,14 +767,17 @@ def reject_action(request, **kwargs): json_answer = json.dumps(status) return HttpResponse (json_answer, content_type="application/json") +def get_current_site(request): + if request.is_secure(): + current_site = 'https://' + else: + current_site = 'http://' + current_site += request.META['HTTP_HOST'] + return current_site def portal_reject_request(wsgi_request, request_ids): status = {} - # get the domain url - current_site = Site.objects.get_current() - current_site = current_site.domain - - + current_site = get_current_site(wsgi_request) if not isinstance(request_ids, list): request_ids = [request_ids] @@ -876,30 +884,38 @@ def portal_reject_request(wsgi_request, request_ids): else: raise Exception, 'unknown type of request %s' % request['type'] - send_status_email(ctx, user_email, request['type'], 'denied') + send_status_email(wsgi_request, ctx, user_email, request['type'], 'denied') except Exception, e: request_status['SFA '+request['type']] = {'status': False, 'description': str(e)} + logger.error('ERROR - actions.py - portal_reject_request: %s' % e) + import traceback + logger.error(traceback.format_exc()) status['%s__%s' % (request['type'], request['id'])] = request_status return status -def send_status_email(ctx, user_email, obj_type, status): +def send_status_email(request, ctx, user_email, obj_type, status): try: + ctx['current_site'] = get_current_site(request) + ctx['theme'] = theme + theme.template_name = obj_type + '_request_' + status + '.txt' text_content = render_to_string(theme.template, ctx) theme.template_name = obj_type + '_request_' + status + '.html' html_content = render_to_string(theme.template, ctx) theme.template_name = 'email_default_sender.txt' + sender = render_to_string(theme.template, ctx) sender = sender.replace('\n', '') - subject = obj_type + ' request '+ status +'.' + subject = obj_type.title() + ' request '+ status msg = EmailMultiAlternatives(subject, text_content, sender, [user_email]) msg.attach_alternative(html_content, "text/html") msg.send() except Exception as e: + print e logger.error("Failed to send email, please check the mail templates and the SMTP configuration of your server") @@ -1038,29 +1054,33 @@ def create_pending_join(wsgi_request, request): # SEND EMAILS #------------------------------------------------------------------------------- -def send_email_to_pis(wsgi_request, request, obj_type): +def send_email_to_pis(request, context, obj_type): try: + context['current_site'] = get_current_site(request) + context['theme'] = theme # Send an email: the recipients are the PIs of the authority - recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) + recipients = authority_get_pi_emails(request, context['authority_hrn']) theme.template_name = obj_type + '_request_email.txt' - text_content = render_to_string(theme.template, request) + text_content = render_to_string(theme.template, context) theme.template_name = obj_type + '_request_email.html' - html_content = render_to_string(theme.template, request) + html_content = render_to_string(theme.template, context) - theme.template_name = obj_type + '_request_email_subject.txt' - subject = render_to_string(theme.template, request) - subject = subject.replace('\n', '') + #theme.template_name = obj_type + '_request_email_subject.txt' + #subject = render_to_string(theme.template, request) + #subject = subject.replace('\n', '') + subject = "New "+obj_type+" request" theme.template_name = 'email_default_sender.txt' - sender = render_to_string(theme.template, request) + sender = render_to_string(theme.template, context) sender = sender.replace('\n', '') msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: + print e print "Failed to send email, please check the mail templates and the SMTP configuration of your server" @@ -1230,6 +1250,8 @@ def create_pending_user(wsgi_request, request, user_detail): ) b.save() # sends email to user to activate the email + request['current_site'] = get_current_site(wsgi_request) + request['theme'] = theme theme.template_name = 'activate_user.html' html_content = render_to_string(theme.template, request) theme.template_name = 'activate_user.txt'