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

[myslice.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 5d5a690..b51273f 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -117,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
             }
@@ -164,7 +164,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                     self.template_name = 'slice-request-ack-view.html'
                 
                 # log user activity
-                activity.user.slice(self.request)
+                activity.user.slice(wsgi_request)
                 
                 return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST
         else:
@@ -181,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,