From f0788c6415084ce6769e8e9a765964561fc0160b Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 6 Aug 2018 12:41:49 +0100 Subject: [PATCH] Fixes on Engraver --- resources/sql/queries.sql | 4 ++-- resources/templates/base.html | 4 ++-- 2 files changed, 4 insertions(+), 4 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..c14f6de 100644 --- a/resources/templates/base.html +++ b/resources/templates/base.html @@ -37,12 +37,12 @@

{{title}}

- {% if message|not-empty %} + {% if message %}
{{ message }}
{% endif %} - {% if error|not-empty %} + {% if error %}
{{ error }}