Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 0f58669..4a52560 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -16,6 +16,8 @@ from myslice.theme import ThemeView
 
 import json, time, re
 
+import activity.user
+
 class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
     template_name = 'slicerequest_view.html'
     
@@ -124,7 +126,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             slice_name = slice_request['slice_name']
             req_slice_hrn = authority_hrn + '.' + slice_name
             # comparing requested slice_hrn with the existing slice_hrn 
-            slice_query  = Query().get('slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
+            slice_query  = Query().get('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
             slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
             for _slice in slice_details_sfa:
                 if _slice['slice_hrn'] == req_slice_hrn:
@@ -161,6 +163,9 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                     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 = {}