From de55728d1c5cf146f8ded039074fe9f8f9e032ce Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 2 Apr 2014 12:22:35 +0200 Subject: [PATCH] FIX: if sfa parent_authority is None use local DB --- portal/slicetabusers.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/portal/slicetabusers.py b/portal/slicetabusers.py index 861b0cbe..df9b6c95 100644 --- a/portal/slicetabusers.py +++ b/portal/slicetabusers.py @@ -15,6 +15,7 @@ from manifold.core.query import Query, AnalyzedQuery from manifoldapi.manifoldapi import execute_query from myslice.theme import ThemeView +import json class SliceUserView (LoginRequiredView, ThemeView): template_name = "slice-tab-users-view.html" @@ -23,5 +24,15 @@ class SliceUserView (LoginRequiredView, ThemeView): 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) - + # if sfa returns 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) + for user_config in user_details: + 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)) -- 2.43.0