X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabusers.py;h=cb6216573ce1689a72cb5dca4c5623e5ba1af5f1;hb=refs%2Fheads%2Fonelab;hp=0105cb1db1f30c43d41c5121dca04fb061a6fd87;hpb=3decb43fcae0a5df9d9c0ccee50e208956453d12;p=myslice.git diff --git a/portal/slicetabusers.py b/portal/slicetabusers.py index 0105cb1d..cb621657 100644 --- a/portal/slicetabusers.py +++ b/portal/slicetabusers.py @@ -14,16 +14,24 @@ from unfold.page import Page from manifold.core.query import Query, AnalyzedQuery from manifoldapi.manifoldapi import execute_query -from theme import ThemeView +from myslice.theme import ThemeView +import json class SliceUserView (LoginRequiredView, ThemeView): template_name = "slice-tab-users-view.html" 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: + # 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'] - print self.template - 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))