git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bbcad94
)
FIX: if sfa parent_authority is None use local DB
author
Yasin
<mohammed-yasin.rahman@lip6.fr>
Wed, 2 Apr 2014 10:22:35 +0000
(12:22 +0200)
committer
Yasin
<mohammed-yasin.rahman@lip6.fr>
Wed, 2 Apr 2014 10:22:35 +0000
(12:22 +0200)
portal/slicetabusers.py
patch
|
blob
|
history
diff --git
a/portal/slicetabusers.py
b/portal/slicetabusers.py
index
861b0cb
..
df9b6c9
100644
(file)
--- 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
from manifoldapi.manifoldapi import execute_query
from myslice.theme import ThemeView
+import json
class SliceUserView (LoginRequiredView, ThemeView):
template_name = "slice-tab-users-view.html"
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 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))
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))