X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=ac712772f596c5d609d625697a76a5a9d5a82bc8;hb=2c48c6a1923496c3d7ee79ea8e1c397db1399f85;hp=8a99adbe8cd59952558dcb9c4c60af36cb451116;hpb=0fb98decd67ec695937480b4d5448adbcd508565;p=cavote.git

diff --git a/main.py b/main.py
index 8a99adb..ac71277 100755
--- a/main.py
+++ b/main.py
@@ -144,6 +144,13 @@ def user_password(userid):
 #------------
 # User admin
 
+@app.route('/users/admin/list')
+def admin_users():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    users = query_db('select * from users order by id desc')
+    return render_template('admin_users.html', users=users)
+
 @app.route('/users/admin/add', methods=['GET', 'POST'])
 def add_user():
     if not session.get('user').get('is_admin'):
@@ -207,13 +214,13 @@ def del_role(idrole):
 def show_votes(votes):
     today = date.today()
     active_button = votes
-    basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role'
+    basequery = 'select *, roles.name as rolename from votes join roles on roles.id=votes.id_role where open=1'
     if votes == 'all':
         votes = query_db(basequery + ' order by id desc')
     elif votes == 'archive':
-        votes = query_db(basequery + ' where date_end < (?) order by id desc', [today])
+        votes = query_db(basequery + ' and date_end < (?) order by id desc', [today])
     elif votes == 'current':
-        votes = query_db(basequery + ' where date_end >= (?) order by id desc', [today])
+        votes = query_db(basequery + ' and date_end >= (?) order by id desc', [today])
     else:
         abort(404)
     return render_template('show_votes.html', votes=votes, active_button=active_button)
@@ -248,6 +255,13 @@ def show_vote(idvote):
 #-------------
 # Votes admin
 
+@app.route('/votes/admin/list')
+def admin_votes():
+    if not session.get('user').get('is_admin'):
+        abort(401)
+    votes = query_db('select *, roles.name as rolename from votes join roles on roles.id=votes.id_role order by id desc')
+    return render_template('admin_votes.html', votes=votes)
+
 @app.route('/votes/admin/add', methods=['GET', 'POST'])
 def add_vote():
     if not session.get('user').get('is_admin'):