From: Guillaume Subiron <maethor@subiron.org>
Date: Tue, 5 Jun 2012 10:10:10 +0000 (+0200)
Subject: Debug
X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=c3c288ea9ed3cfc8ef208cb3746bfe3715cf5a00

Debug
---

diff --git a/main.py b/main.py
index 78998b0..3937dfb 100755
--- a/main.py
+++ b/main.py
@@ -342,11 +342,11 @@ def can_vote(idvote, iduser=-1):
     vote = query_db('select * from votes where id=?', [idvote], one=True)
     if vote is None:
         return False
-    if not vote['is_finished']:
+    if vote['is_finished'] == 0:
         if iduser > 0: 
             if can_see_vote(idvote, iduser): 
                 if not has_voted(idvote, iduser):
-                    if query_db('select * from user_group where id_user = ? and id_group = ?', [iduser, vote['id']], one=True):
+                    if query_db('select * from user_group where id_user = ? and id_group = ?', [iduser, vote['id_group']], one=True):
                         return True
     return False
 
diff --git a/templates/admin_votes.html b/templates/admin_votes.html
index e3faf72..1425921 100644
--- a/templates/admin_votes.html
+++ b/templates/admin_votes.html
@@ -22,7 +22,7 @@
     {% for vote in votes %}
     <tr>
       <td>{{ vote.title }}</td>
-      <td>{% if vote.is_terminated %}<span class="label label-sucess">Terminé</span>{% else %}{% if vote.is_open %}<span class="label label-info">Ouvert</span>{% else %}<span class="label label-important">Fermé</span>{% endif %}{% endif %}</td>
+      <td>{% if vote.is_terminated %}<span class="label label-success">Terminé</span>{% else %}{% if vote.is_open %}<span class="label label-info">Ouvert</span>{% else %}<span class="label label-important">Fermé</span>{% endif %}{% endif %}</td>
       <td>{{ vote.date_end }}</td>
       <td>{{ vote.groupname }}</td>
       <td>{{ vote.category }}</td>
diff --git a/templates/vote.html b/templates/vote.html
index 8d6e9dd..8c0f3e1 100644
--- a/templates/vote.html
+++ b/templates/vote.html
@@ -14,7 +14,7 @@
       {% for choice in choices %}
       <th>{{ choice.name }}</th>
       {% endfor %}
-      {% if 'user' in 'session' %}
+      {% if 'user' in session %}
       <th></th>
       {% endif %}
     </tr>
@@ -31,7 +31,7 @@
       {% else %}
       <td class="no"></td>{% endif %}
       {% endfor %}
-      {% if 'user' in 'session' %}
+      {% if 'user' in session %}
       <td>{% if user.userid == session.user.id %}<a href="{{ url_for('vote_deletechoices', idvote=vote.id, iduser=session.user.id) }}" class="btn btn-mini btn-danger" title="Supprimer"><i class="icon-remove icon-white"></a>{% endif %}</td>
       {% endif %}
     </tr>
@@ -64,7 +64,7 @@
       {% for choice in choices %}
       <td>{{ choice.nb }}</td>
       {% endfor %}
-      {% if 'user' in 'session' %}
+      {% if 'user' in session %}
       <td></td>
       {% endif %}
     </tr>