from manifold.core.query import Query
from manifoldapi.manifoldapi import execute_admin_query, execute_query
-from portal.actions import is_pi, create_slice, create_pending_slice
+from portal.actions import is_pi, create_slice, create_pending_slice, clear_user_creds
#from portal.forms import SliceRequestForm
from unfold.loginrequired import LoginRequiredAutoLogoutView
from ui.topmenu import topmenu_items_live, the_user
import json, time, re
+import activity.user
+
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
template_name = 'slicerequest_view.html'
errors = []
slice_name =''
purpose=''
- exp_url=''
+ url=''
+ authority_hrn = None
+ authority_name = None
# Retrieve the list of authorities
authorities_query = Query.get('authority').select('name', 'authority_hrn')
authorities = execute_admin_query(wsgi_request, authorities_query)
if authority['authority_hrn'] == user_authority:
authority_name = authority['name']
+ # Handle the case when we use only hrn and not name
+ if authority_name is None:
+ authority_name = user_authority
#
account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config')
account_details = execute_query(wsgi_request, account_query)
if authority['name'] == wsgi_request.POST.get('org_name', ''):
authority_hrn = authority['authority_hrn']
- # Handle the case when the template uses only hrn and not name
- if not authority_hrn:
+ # Handle the case when we use only hrn and not name
+ if authority_hrn is None:
authority_hrn = wsgi_request.POST.get('org_name', '')
slice_request = {
'authority_hrn' : authority_hrn,
'organization' : wsgi_request.POST.get('org_name', ''),
'slice_name' : wsgi_request.POST.get('slice_name', ''),
- 'exp_url' : wsgi_request.POST.get('exp_url', ''),
+ 'url' : wsgi_request.POST.get('url', ''),
'purpose' : wsgi_request.POST.get('purpose', ''),
'current_site' : current_site
}
if (purpose is None or purpose == ''):
errors.append('Experiment purpose is mandatory')
- exp_url = slice_request['exp_url']
+ url = slice_request['url']
if not errors:
if is_pi(wsgi_request, user_hrn, authority_hrn):
# PIs can directly create slices in their own authority...
create_slice(wsgi_request, slice_request)
+ clear_user_creds(wsgi_request, user_email)
self.template_name = 'slice-request-done-view.html'
else:
# Otherwise a wsgi_request is sent to the PI
create_pending_slice(wsgi_request, slice_request, user_email)
self.template_name = 'slice-request-ack-view.html'
+ # log user activity
+ activity.user.slice(wsgi_request)
+
return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST
else:
slice_request = {}
'purpose': purpose,
'email': user_email,
'user_hrn': user_hrn,
- 'exp_url': exp_url,
+ 'url': url,
'pi': pi,
'authority_name': authority_name,
'authority_hrn': user_authority,