X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabusers.py;h=51623cf5db9c5578ca362c66afdcd4954d5562f4;hb=refs%2Fheads%2Ff4f-review;hp=df9b6c95d9bab4d5ca0ccae6b2e60f2b15191f2a;hpb=f67d901951fa3b3dfae6a2692156dfa7ab67c496;p=myslice.git diff --git a/portal/slicetabusers.py b/portal/slicetabusers.py index df9b6c95..51623cf5 100644 --- a/portal/slicetabusers.py +++ b/portal/slicetabusers.py @@ -22,10 +22,10 @@ class SliceUserView (LoginRequiredView, ThemeView): def get(self, request, slicename): if request.user.is_authenticated(): - user_query = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn') - user_details = execute_query(self.request, user_query) + # user_query = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn') + #user_details = execute_query(self.request, user_query) # if sfa returns None - if user_details[0]['parent_authority'] is None: + #if user_details[0]['parent_authority'] is None: # find in local DB user_query = Query().get('local:user').select('config') user_details = execute_query(request, user_query) @@ -33,6 +33,24 @@ class SliceUserView (LoginRequiredView, ThemeView): config = json.loads(user_config['config']) config['authority'] = config.get('authority') user_details[0]['parent_authority'] = config['authority'] - - - return render_to_response(self.template, {"slice": slicename, "user_details":user_details[0], "theme": self.theme, "username": request.user, "section":"users"}, context_instance=RequestContext(request)) + + ## check user is pi or not + platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') + account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + platform_details = execute_query(self.request, platform_query) + account_details = execute_query(self.request, account_query) + for platform_detail in platform_details: + for account_detail in account_details: + if platform_detail['platform_id'] == account_detail['platform_id']: + if 'config' in account_detail and account_detail['config'] is not '': + account_config = json.loads(account_detail['config']) + if 'myslice' in platform_detail['platform']: + acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + + # assigning values + if acc_auth_cred == {}: + pi = "is_not_pi" + else: + pi = "is_pi" + + return render_to_response(self.template, {"slice": slicename, "user_details":user_details[0], "pi":pi, "theme": self.theme, "username": request.user, "section":"users"}, context_instance=RequestContext(request))