Fix: if authrity_get_email is None, it returns support@myslice.info

diff --git a/portal/registrationview.py b/portal/registrationview.py
index d594cfc..a16ae25 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -175,12 +175,9 @@ class RegistrationView (FreeAccessView, ThemeView):
                     'user_hrn'      : user_hrn,
                     'public_key'    : public_key,
                     }
+                
                 recipients = authority_get_pi_emails(request,reg_auth)
                 
-                # We don't need to send this email to user.
-                # it's for the PI only
-                #if ctx['cc_myself']:
-                #    recipients.append(ctx['email'])
 
                 msg = render_to_string('user_request_email.txt', ctx)
                 send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 9658f72..2455b92 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -108,11 +108,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
     
                 # The recipients are the PI of the authority
                 recipients = authority_get_pi_emails(request, authority_hrn)
-                # if get_pu_emails fails:
-                recipients.append('support@myslice.info')
-                #recipients = ['support@myslice.info']
                 msg = render_to_string('slice-request-email.txt', ctx)
-                #print "email, msg, email, recipients", email , msg, email, recipients 
                 send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
                 
                 self.template_name = 'slice-request-ack-view.html'