X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=735fa6d5a1a1a77238622a92e176bfc822aef119;hb=965e005bba1208ef170275c170bd7f7cc1cadbfa;hp=d9488c93a927d343f4e07e6d65c172ad4b57dba6;hpb=6e512c0dae7df7303cfeaabc0044ecc523311de6;p=cavote.git

diff --git a/main.py b/main.py
index d9488c9..735fa6d 100755
--- a/main.py
+++ b/main.py
@@ -158,8 +158,19 @@ def user_password(userid):
 def admin_users():
     if not session.get('user').get('is_admin'):
         abort(401)
-    users = query_db('select *, roles.name as rolename from (select *, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
-    # :TODO:maethor:20120530: Find a way to reduce the dict
+    tuples = query_db('select *, roles.name as rolename from (select *, id as userid, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+    users = dict()
+    for t in tuples:
+        if t['userid'] in users:
+            users[t['userid']]['roles'].append(t["rolename"])
+        else:
+            users[t['userid']] = dict()
+            users[t['userid']]['userid'] = t['userid']
+            users[t['userid']]['email'] = t['email']
+            users[t['userid']]['username'] = t['username']
+            users[t['userid']]['is_admin'] = t['is_admin']
+            users[t['userid']]['roles'] = [t['rolename']]
+
     return render_template('admin_users.html', users=users)
 
 @app.route('/admin/users/add', methods=['GET', 'POST'])