send_email: backup recipient email added [support@myslice.info]

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 455b175..47c1cdc 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -173,12 +173,9 @@ class RegistrationView (FreeAccessView):
                     'public_key'    : public_key,
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)
                     'public_key'    : public_key,
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)

+                # backup email: if authority_get_pi_emails fails
+                recipients.append('support@myslice.info')

                 
                 

-                # 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)
                 return render(request, 'user_register_complete.html') 
                 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)
                 return render(request, 'user_register_complete.html') 

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index b960184..dae6a49 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -55,8 +55,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
                         user_hrn = account_config.get('user_hrn','N/A')
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
                         user_hrn = account_config.get('user_hrn','N/A')

-
-
+    

         #user_query  = Query().get('user').select('user_hrn').filter_by('user_hrn','==','$user_hrn')
         #user_hrn = execute_query(self.request, user_query)
         #self.user_hrn = user_hrn[0].get('user_hrn')
         #user_query  = Query().get('user').select('user_hrn').filter_by('user_hrn','==','$user_hrn')
         #user_hrn = execute_query(self.request, user_query)
         #self.user_hrn = user_hrn[0].get('user_hrn')


@@ -74,7 +73,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             number_of_nodes = request.POST.get('number_of_nodes', '')
             purpose = request.POST.get('purpose', '')
             email = self.user_email
             number_of_nodes = request.POST.get('number_of_nodes', '')
             purpose = request.POST.get('purpose', '')
             email = self.user_email

-            user_hrn = user_hrn
+            #user_hrn = user_hrn

             cc_myself = True
             
             if (authority_hrn is None or authority_hrn == ''):
             cc_myself = True
             
             if (authority_hrn is None or authority_hrn == ''):


@@ -106,8 +105,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
                 # The recipients are the PI of the authority
                 recipients = authority_get_pi_emails(request, authority_hrn)
     
                 # The recipients are the PI of the authority
                 recipients = authority_get_pi_emails(request, authority_hrn)
     

-                if cc_myself:
-                    recipients.append(email)
+                #if cc_myself:
+                recipients.append('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)
                 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)