merge
authorciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:46 +0000 (17:36 +0200)
committerciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:46 +0000 (17:36 +0200)
1  2 
portal/slicerequestview.py
portal/templates/fed4fire/fed4fire_projectrequest_view.html
portal/templates/slicerequest_view.html

@@@ -133,16 -133,18 +140,16 @@@ class SliceRequestView (LoginRequiredAu
                  'email'             : user_email,
                  'timestamp'         : time.time(),
                  'authority_hrn'     : authority_hrn,
-                 'organization'      : wsgi_request.POST.get('org_name', ''),
+                 'organization'      : request.POST.get('org_name', ''),
 -                'slice_name'        : request.POST.get('slice_name', ''),
 +                'slice_name'        : slice_name,
-                 'url'               : wsgi_request.POST.get('url', ''),
-                 'purpose'           : wsgi_request.POST.get('purpose', ''),
+                 'url'               : request.POST.get('url', ''),
+                 'purpose'           : request.POST.get('purpose', ''),
                  'current_site'      : current_site
              }
 -            
 -            # create slice_hrn based on authority_hrn and slice_name
 -            slice_name = slice_request['slice_name']
 +
              # slice name is unique among all authorities 
 -            slice_query  = Query().get('myslice:slice').select('slice_hrn')
 -            slice_details_sfa = execute_admin_query(request, slice_query)
 +            slice_query = Query().get('myslice:slice').select('slice_hrn')
 +            slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
              for _slice in slice_details_sfa:
                  split_list = _slice['slice_hrn'].split('.')
                  sfa_slice_name = split_list[-1]