fix on users and projects

[osm/LW-UI.git] / userhandler / views.py

diff --git a/userhandler/views.py b/userhandler/views.py
index 0c12a84..1703233 100644 (file)
--- a/userhandler/views.py
+++ b/userhandler/views.py
@@ -31,9 +31,23 @@ def user_list(request):
     user = osmutils.get_user(request)
     client = Client()
     result = client.user_list(user.get_token())
+    result_projects = client.project_list(user.get_token())
+    p_map = {'admin': 'admin'}
+    for p in result_projects['data']:
+        p_map[p['_id']] = p['name']
+    users = result['data'] if result and result['error'] is False else []
+    for user in users:
+        user_project_ids = user['projects']
+        user_project_names = []
+        for p_id in user_project_ids:
+            if p_id in p_map:
+                user_project_names.append(p_map[p_id])
+        user['projects'] = user_project_names
+
     result = {
         'users': result['data'] if result and result['error'] is False else []
     }
+    
     return __response_handler(request, result, 'user_list.html')