X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=f92214e32ae7094813f1e3a193bbd6d547502215;hb=094cdb72aaa89588fffac49b42c1d3003152de04;hp=4f332e4a14a1b3d30e6bf7c0322b1cf52cdd4e6f;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 4f332e4a..f92214e3 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -8,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): @@ -54,10 +54,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView): #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) - send_mail("Onelab New Slice request form submitted", msg, email, recipients) + msg = render_to_string('slice-request-email.txt', form.cleaned_data) + send_mail("Onelab user %s requested a slice"%email , 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) @@ -65,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)