From 21694dbfd43b8a4d9649ca84d4530e3778f5db39 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jordan=20Aug=C3=A9?= Date: Wed, 5 Mar 2014 07:29:33 +0100 Subject: [PATCH] fixed small issues with slice creation for a non pi --- portal/actions.py | 6 +++--- portal/slicerequestview.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portal/actions.py b/portal/actions.py index ccdd38f1..64f48027 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -378,7 +378,7 @@ def create_slice(wsgi_request, request): raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn'] return results -def create_pending_slice(wgsi_request, request): +def create_pending_slice(wsgi_request, request, email): """ """ @@ -393,9 +393,9 @@ def create_pending_slice(wgsi_request, request): s.save() # Send an email: the recipients are the PI of the authority - recipients = authority_get_pi_emails(wsgi_request, authority_hrn) + recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) msg = render_to_string('slice-request-email.txt', request) - send_mail("Onelab user %(email)s requested a slice" % request, msg, email, recipients) + send_mail("Onelab user %(email)s requested a slice" % locals(), msg, email, recipients) #------------------------------------------------------------------------------- # REQUESTS - Users diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 30f7f880..dfa46585 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -95,7 +95,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): self.template_name = 'slice-request-done-view.html' else: # Otherwise a wsgi_request is sent to the PI - create_pending_slice(wsgi_request, slice_request) + create_pending_slice(wsgi_request, slice_request, user_email) self.template_name = 'slice-request-ack-view.html' return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST -- 2.43.0