git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added W-iLab.t Logo
[unfold.git]
/
portal
/
slicerequestview.py
diff --git
a/portal/slicerequestview.py
b/portal/slicerequestview.py
index
d18289f
..
1f377d8
100644
(file)
--- a/
portal/slicerequestview.py
+++ b/
portal/slicerequestview.py
@@
-10,7
+10,7
@@
from portal.forms import SliceRequestForm
from unfold.loginrequired import LoginRequiredAutoLogoutView
from ui.topmenu import topmenu_items_live, the_user
from unfold.loginrequired import LoginRequiredAutoLogoutView
from ui.topmenu import topmenu_items_live, the_user
-from theme import ThemeView
+from
myslice.
theme import ThemeView
import json, time
import json, time
@@
-87,7
+87,7
@@
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
purpose = slice_request['purpose']
if (purpose is None or purpose == ''):
errors.append('Purpose is mandatory')
purpose = slice_request['purpose']
if (purpose is None or purpose == ''):
errors.append('Purpose is mandatory')
-
+
if not errors:
if is_pi(wsgi_request, user_hrn, authority_hrn):
# PIs can directly create slices in their own authority...
if not errors:
if is_pi(wsgi_request, user_hrn, authority_hrn):
# PIs can directly create slices in their own authority...
@@
-95,7
+95,7
@@
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
self.template_name = 'slice-request-done-view.html'
else:
# Otherwise a wsgi_request is sent to the PI
self.template_name = 'slice-request-done-view.html'
else:
# Otherwise a wsgi_request is sent to the PI
- create_pending_slice(wsgi_request,
user_email, slice_name, user_hrn, authority_hrn, number_of_nodes, purpose
)
+ create_pending_slice(wsgi_request,
slice_request, user_email
)
self.template_name = 'slice-request-ack-view.html'
return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST
self.template_name = 'slice-request-ack-view.html'
return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST
@@
-110,7
+110,8
@@
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
'user_hrn': user_hrn,
'cc_myself': True,
'authorities': authorities,
'user_hrn': user_hrn,
'cc_myself': True,
'authorities': authorities,
- 'theme': self.theme
+ 'theme': self.theme,
+ 'section': "Slice request"
}
template_env.update(slice_request)
template_env.update(page.prelude_env())
}
template_env.update(slice_request)
template_env.update(page.prelude_env())