From 130d12975d919637e1608d3f229d0e92555b07db Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Mon, 6 Aug 2018 09:29:56 +0100
Subject: [PATCH] Safety commit

Ran out of electricity last night when I'd almost but not quite got creation working properly. Frustrating! I don't have much electricity this morning so I'm pushing this up to GitHub for safety.
---
 resources/sql/queries.sql          | 4 ++--
 resources/templates/base.html      | 2 --
 src/clj/youyesyet/routes/roles.clj | 2 +-
 youyesyet.adl.xml                  | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index a693fa3..822b2d6 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -75,5 +75,5 @@ SELECT roles.*
 FROM roles, ln_canvassers_roles
 WHERE roles.id = ln_canvassers_roles.role_id
 	AND ln_canvassers_roles.canvasser_id = :id
-ORDER BY canvassers.name,
-	canvassers.id
+ORDER BY roles.name,
+	roles.id
diff --git a/resources/templates/base.html b/resources/templates/base.html
index 54b4f02..b178034 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -42,11 +42,9 @@
         {{ message }}
       </div>
       {% endif %}
-      {% if error|not-empty %}
       <div class="error">
         {{ error }}
       </div>
-      {% endif %}
     </header>
     {% endblock %}
     <div id="main-container" class="container">
diff --git a/src/clj/youyesyet/routes/roles.clj b/src/clj/youyesyet/routes/roles.clj
index 7f7ba3d..9a49acc 100644
--- a/src/clj/youyesyet/routes/roles.clj
+++ b/src/clj/youyesyet/routes/roles.clj
@@ -22,7 +22,7 @@
      user (-> request :session :user)
      roles (if
              user
-             (db-core/list-roles-by-canvasser db-core/*db* {:id (:id user)}))]
+             (db-core/list-roles-by-canvasser db-core/*db* user))]
     (log/info (str "Roles routing page; user is " user "; roles are " roles))
     (cond
       roles (layout/render "roles.html"
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 1ac1fe3..0f905c4 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -782,6 +782,7 @@ version="0.1.1">
   </entity>
 
   <entity table="teams" name="teams" magnitude="4" volatility="4">
+    <documentation>Organised teams of canvassers who canvass together.</documentation>
     <key>
       <property type="integer" name="id" column="id"
       distinct="system" immutable="true">