X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=8d2104f29ea0f2e59e5e03b0d11786b82dff9152;hb=31540dd504798e0aca69e10d8144fbedc5b16af8;hp=e42619e83cb1cd193011e2353b007540065e1ca2;hpb=0b28b9a05826740f82decbd9e29662bf008e3b5c;p=myslice.git

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index e42619e8..8d2104f2 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -1,5 +1,6 @@
 from django.template.loader      import render_to_string
 from django.shortcuts            import render
+from django.core.mail            import send_mail
 
 from manifold.core.query         import Query
 from manifold.manifoldapi        import execute_query
@@ -7,7 +8,7 @@ from manifold.manifoldapi        import execute_query
 from portal.models               import PendingSlice
 from portal.actions              import authority_get_pi_emails
 from portal.forms                import SliceRequestForm
-from portal.templateviews        import LoginRequiredAutoLogoutView
+from unfold.loginrequired        import LoginRequiredAutoLogoutView
 from myslice.viewutils           import topmenu_items, the_user
 
 class SliceRequestView (LoginRequiredAutoLogoutView):
@@ -49,14 +50,14 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             cc_myself = form.cleaned_data['cc_myself']
 
             # The recipients are the PI of the authority
-            recipients = authority_get_pi_emails(authority_hrn)
+            recipients = authority_get_pi_emails(request,authority_hrn)
             #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
             if cc_myself:
                 recipients.append(email)
-            msg = render_to_string('slice_request_email.txt', form.cleaned_data)
+            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
             send_mail("Onelab New Slice request form submitted", msg, email, recipients)
 
-            return render(request,'slicereq_recvd.html') # Redirect after POST
+            return render(request,'slice-request-ack-view.html') # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -64,7 +65,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
         return self._display (request, SliceRequestForm(initial=self.authority_hrn_initial(request)))
 
     def _display (self, request, form):
-        return render(request, 'slice_request.html', {
+        return render(request, 'slice-request-view.html', {
                 'form': form,
                 'topmenu_items': topmenu_items('Request a slice', request),
                 'username': the_user (request)