X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=6589e8a1451aefd9afcd196c06ba657ff3904440;hb=15ca59cb1f80be244df33026add2cf97f2f87a62;hp=8d2104f29ea0f2e59e5e03b0d11786b82dff9152;hpb=31540dd504798e0aca69e10d8144fbedc5b16af8;p=myslice.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 8d2104f2..6589e8a1 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -14,9 +14,10 @@ from myslice.viewutils 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} @@ -55,7 +56,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView): 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) + send_mail("Onelab user %s requested a slice"%email , msg, email, recipients) return render(request,'slice-request-ack-view.html') # Redirect after POST else: