X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=cf818dc762485b8e91f2ac48e081bd5f368cab72;hb=3d16aa36af64e8e0e5ce3a48c34df158fbfaae29;hp=9d7a970269b65a8a8b664c5d7b3bf6f35d03a621;hpb=a7337c66c2c7c3312c4205a8119252f04a1fbd58;p=myslice.git

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 9d7a9702..cf818dc7 100644
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -12,7 +12,9 @@ from portal.actions              import authority_get_pi_emails
 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):
     def __init__ (self):
         self.user_email = ''
@@ -37,10 +39,29 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         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)
+
+        # 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 +74,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             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
             
             if (authority_hrn is None or authority_hrn == ''):
@@ -101,11 +122,10 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
           '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)
-