Bug fixes for batch, round 1

Author: njl

app.py

@@ -242,7 +242,7 @@ def batch_view(id):
         proposals.sort(key=lambda x:-x['voters_count'])
     else:
         random.shuffle(proposals)
-    basics = {x['proposal'].id:x['proposal'].title for x in proposals}
+    basics = {x['proposal'].id:x['proposal'].data['title'] for x in proposals}
     vote = l.get_batch_vote(id, request.user.id)
     msgs = l.get_batch_messages(id)
     l.mark_batch_read(id, request.user.id)

dev-config/PSQL_CONNECTION_STRING

@@ -1 +1 @@
-postgresql+psycopg2://test:test@localhost:5432/test
+postgresql+psycopg2://progcom:progcom@localhost:5432/progcom

logic.py

@@ -422,7 +422,7 @@ def toggle_lock_batch(id, lock):
     execute(q, lock, id)
 
 def full_proposal_list(email):
-    q = '''SELECT p.id, p.data->>'title', bg.id as batch_id, p.accepted,
+    q = '''SELECT p.id, p.data->>'title' AS title, bg.id as batch_id, p.accepted,
             array_to_string(p.author_names, ', ') AS author_names,
             COALESCE(bg.name, '') AS batchgroup,
             EXISTS (SELECT 1 FROM users
@@ -589,7 +589,7 @@ def get_my_pycon(user):
     q = 'SELECT batchgroup, accept FROM batchvotes WHERE voter=%s'
     votes = fetchall(q, user)
 
-    q = '''SELECT data->>'title', id,
+    q = '''SELECT data->>'title' AS title, id,
             array_to_string(author_names, ', ') AS author_names,
             accepted
             FROM proposals WHERE batchgroup IS NOT NULL'''

templates/batch/batchgroup.html

@@ -8,10 +8,10 @@ <h1>Group: {{group.name}}</h1>
 <h4>This Group is Locked <span class="glyphicon glyphicon-lock"></span></h4>
 {% endif%}
 <div class="col-md-12" style="margin-bottom:1em;">
-        <ul class="nav nav-pills nav-justified" id="proposal-tabs">
+        <ul class="nav nav-pills nav-justified" id="proposal-tabs" style="display:flex;flex-direction:row;flex-wrap:wrap;justify-content:flex-start;align-items:stretch;">
             {% for p in proposals %}
-            <li>
-            <a href="#proposal-{{p.proposal.id}}">{{p.proposal.title}} (#{{p.proposal.id}})
+            <li style="width:20%;padding-bottom:0;border:1px solid #eee;">
+                <a href="#proposal-{{p.proposal.id}}" style="height:100%;">{{p.proposal.data.title}} (#{{p.proposal.id}})
                     {% if p.proposal.count and (vote or request.user.email in config.OBSERVER_EMAILS) %}
                     <span class="badge">{{p.proposal.count}} nominations</span>
                     {%endif%}
@@ -80,7 +80,7 @@ <h2>Screening Discussion</h2>
     </div>
 
     <script type="underscore/template" id="ordered_row">
-<li class="list-group-item"><span class="glyphicon glyphicon-star"></span> <%=title%> (#<%=id%>)
+<li class="list-group-item"><span class="glyphicon glyphicon-star"></span> <%=data.title%> (#<%=id%>)
             <input type="hidden" name="accept" value="<%=id%>"></li>
     </script>
 
@@ -156,7 +156,7 @@ <h4>Remaining Proposals</h4>
                             style="display:none;"
                             {%endif%}
                             >
-                            {{p.proposal.title}} (#{{p.proposal.id}})
+                            {{p.proposal.data.title}} (#{{p.proposal.id}})
                         </li>
                             {% endfor %}
                     </ul>