X-Git-Url: http://git.cyclocoop.org/%27.%20url_absolue%28find_in_path%28%27aide_body.css%27%29%29.%20?a=blobdiff_plain;f=main.py;h=dc2259d2e736f4837c0a2110d8ca14439c78c475;hb=4e40699a612e494d4d740d69b18d34aa40749789;hp=21a75000a3010a3e0858ed8ed60adc00083ed86d;hpb=d04d0d4a8128e7ac5e0f1a70b5dd06f65ddeed56;p=cavote.git

diff --git a/main.py b/main.py
index 21a7500..dc2259d 100755
--- a/main.py
+++ b/main.py
@@ -381,7 +381,7 @@ def votes(votes):
     basequery = 'select votes.*, max_votes from votes left join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group'
     nb_votes = 'select id_vote, count(*) as nb_votes from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) group by id_vote'
     basequery = 'select * from (' + basequery + ') left join (' + nb_votes + ') on id = id_vote'
-    basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1'
+    basequery = 'select *, votes.id as voteid, groups.name as groupname, users.name as author from (' + basequery + ') as votes join groups on groups.id = id_group join users on users.id = id_author where is_open=1'
     if votes == 'all':
         votes = query_db(basequery + ' order by date_end')
     elif votes == 'archive':