from portal.models import PendingSlice
from portal.actions import authority_get_pi_emails
from portal.forms import SliceRequestForm
-from portal.templateviews import LoginRequiredAutoLogoutView
-from myslice.viewutils import topmenu_items, the_user
+from unfold.loginrequired import LoginRequiredAutoLogoutView
+from ui.topmenu import topmenu_items, the_user
class SliceRequestView (LoginRequiredAutoLogoutView):
def authority_hrn_initial (self, request):
- authorities_query = Query.get('authority').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).select('name', 'authority_hrn')
-# authorities_query = Query.get('authority').select('authority_hrn')
+# authorities_query = Query.get('authority').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).select('name', 'authority_hrn')
+ authorities_query = Query.get('authority').select('authority_hrn')
authorities = execute_query(request, authorities_query)
+ authorities = sorted(authorities)
authority_hrn_tuples = [ (authority['authority_hrn'], authority['name'],) for authority in authorities ]
return {'authority_hrn': authority_hrn_tuples}
#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)
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)