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

[unfold.git] / portal / slicerequestview.py

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index cf818dc..c26f67d 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -2,10 +2,10 @@ from django.template.loader      import render_to_string
 from django.shortcuts            import render
 from django.core.mail            import send_mail
 
-from unfold.page                import Page
+from unfold.page                 import Page
 
 from manifold.core.query         import Query
-from manifold.manifoldapi        import execute_admin_query, execute_query
+from manifoldapi.manifoldapi     import execute_admin_query, execute_query
 
 from portal.models               import PendingSlice
 from portal.actions              import authority_get_pi_emails
@@ -13,9 +13,13 @@ from portal.forms                import SliceRequestForm
 from unfold.loginrequired        import LoginRequiredAutoLogoutView
 from ui.topmenu                  import topmenu_items_live, the_user
 
+from theme import ThemeView
+
 import json
 
 class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
+    template_name = 'slicerequest_view.html'
+    
     def __init__ (self):
         self.user_email = ''
         self.errors = []
@@ -45,7 +49,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
 
         platform_query  = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled')
         platform_details = execute_query(self.request, platform_query)
-
+        user_hrn = None
         # getting user_hrn from local:account
         for account_detail in account_details:
             for platform_detail in platform_details:
@@ -74,7 +78,6 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             number_of_nodes = request.POST.get('number_of_nodes', '')
             purpose = request.POST.get('purpose', '')
             email = self.user_email
-            user_hrn = user_hrn
             cc_myself = True
             
             if (authority_hrn is None or authority_hrn == ''):
@@ -111,10 +114,12 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 msg = render_to_string('slice-request-email.txt', ctx)
                 #print "email, msg, email, recipients", email , msg, email, recipients 
                 send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
-    
-                return render(request,'slice-request-ack-view.html') # Redirect after POST
-     
+                
+                self.template_name = 'slice-request-ack-view.html'
+                
+                return render(request, self.template, {'theme': self.theme}) # Redirect after POST
         template_env = {
+            'username': request.user.email,
           'topmenu_items': topmenu_items_live('Request a slice', page),
           'errors': self.errors,
           'slice_name': request.POST.get('slice_name', ''),
@@ -128,4 +133,4 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
           'theme': self.theme
         }
         template_env.update(page.prelude_env ())
-        return render(request, 'slicerequest_view.html',template_env)
+        return render(request, self.template, template_env)