X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=42395d0cdc27d87552b0817a8cb134ef76c6f006;hb=c48236d2102eaabd62a346cf792430c340821d3e;hp=4975a92f87dbe3f182145fbfae7c9a5571b80e62;hpb=0d118a5f600b06616c2841e92642a303d8785269;p=unfold.git

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 4975a92f..42395d0c 100644
--- 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,7 +13,13 @@ from portal.forms                import SliceRequestForm
 from unfold.loginrequired        import LoginRequiredAutoLogoutView
 from ui.topmenu                  import topmenu_items_live, the_user
 
-class SliceRequestView (LoginRequiredAutoLogoutView):
+from theme import ThemeView
+
+import json
+
+class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
+    template_name = 'slicerequest_view.html'
+    
     def __init__ (self):
         self.user_email = ''
         self.errors = []
@@ -37,10 +43,29 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
         user_email = execute_query(self.request, user_query)
         self.user_email = user_email[0].get('email')
 
-        user_query  = Query().get('user').select('user_hrn').filter_by('user_hrn','==','$user_hrn')
-        user_hrn = execute_query(self.request, user_query)
-        self.user_hrn = user_hrn[0].get('user_hrn')
 
+        account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
+        account_details = execute_query(self.request, account_query)
+
+        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:
+                if platform_detail['platform_id'] == account_detail['platform_id']:
+                    # taking user_hrn only from myslice account
+                    # NOTE: we should later handle accounts filter_by auth_type= managed OR user
+                    if 'myslice' in platform_detail['platform']:
+                        account_config = json.loads(account_detail['config'])
+                        user_hrn = account_config.get('user_hrn','N/A')
+
+
+        #user_query  = Query().get('user').select('user_hrn').filter_by('user_hrn','==','$user_hrn')
+        #user_hrn = execute_query(self.request, user_query)
+        #self.user_hrn = user_hrn[0].get('user_hrn')
+        
+        
         page = Page(request)
         page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
 
@@ -53,7 +78,6 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             number_of_nodes = request.POST.get('number_of_nodes', '')
             purpose = request.POST.get('purpose', '')
             email = self.user_email
-            user_hrn = self.user_hrn
             cc_myself = True
             
             if (authority_hrn is None or authority_hrn == ''):
@@ -84,16 +108,14 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
     
                 # The recipients are the PI of the authority
                 recipients = authority_get_pi_emails(request, authority_hrn)
-    
-                if cc_myself:
-                    recipients.append(email)
                 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', ''),
@@ -101,10 +123,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
           'number_of_nodes': request.POST.get('number_of_nodes', ''),
           'purpose': request.POST.get('purpose', ''),
           'email': self.user_email,
-          'user_hrn': self.user_hrn,
+          'user_hrn': user_hrn,
           'cc_myself': True,
           'authorities': authorities,
+          'theme': self.theme
         }
         template_env.update(page.prelude_env ())
-        return render(request, 'slicerequest_view.html',template_env)
-
+        return render(request, self.template, template_env)