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

[unfold.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 0f58669..b51273f 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'
     
@@ -115,7 +117,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 'authority_hrn'     : authority_hrn,
                 'organization'      : wsgi_request.POST.get('org_name', ''),
                 'slice_name'        : wsgi_request.POST.get('slice_name', ''),
-                'url'               : wsgi_request.POST.get('url', ''),
+                'url'               : wsgi_request.POST.get('exp_url', ''),
                 'purpose'           : wsgi_request.POST.get('purpose', ''),
                 'current_site'      : current_site
             }
@@ -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 = {}
@@ -176,7 +181,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             'url': url,
             'pi': pi,
             'authority_name': authority_name,        
-            'authority_hrn': user_authority,        
+            'authority_hrn': user_authority,
             'cc_myself': True,
             'authorities': authorities,
             'theme': self.theme,