From 7a791f50f4f5b5b5228d3a040bbe224f8b01ff99 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Wed, 19 Sep 2018 15:14:22 +0100
Subject: [PATCH] Minor fixes discovered while working on the record loading
 problem

---
 src/clj/youyesyet/middleware.clj |  2 --
 youyesyet.adl.xml                | 11 ++++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/clj/youyesyet/middleware.clj b/src/clj/youyesyet/middleware.clj
index 1777992..763dea3 100644
--- a/src/clj/youyesyet/middleware.clj
+++ b/src/clj/youyesyet/middleware.clj
@@ -69,10 +69,8 @@
   (fn [request]
     (if-let [user (-> request :session :user)]
       (binding [*user* user]
-        (log/debug "*user* bound as: " *user*)
         (handler request))
       (do
-        (log/debug "No user found in session")
         (handler request)))))
 
 
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 7c9b44f..820514d 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -231,9 +231,6 @@ version="0.1.1">
     column="postcode" size="16" distinct="user">
       <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
     </property>
-    <property type="string" name="phone" column="phone" size="16">
-      <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-    </property>
     <property type="entity" name="district_id" column="district_id"
     entity="districts" farkey="id">
       <prompt prompt="District" locale="en_GB.UTF-8"/>
@@ -276,9 +273,6 @@ version="0.1.1">
       <field property="postcode">
         <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
       </field>
-      <field property="phone">
-        <prompt prompt="Phone" locale="en_GB.UTF-8"/>
-      </field>
       <field property="district_id">
         <prompt prompt="District" locale="en_GB.UTF-8"/>
       </field>
@@ -564,7 +558,7 @@ version="0.1.1">
     column="fullname" size="64" distinct="user">
       <prompt prompt="fullname" locale="en_GB.UTF-8"/>
     </property>
-    <property name="avatar" type="image">
+    <property name="avatar" type="image" size="256">
       <documentation>An image of the canvasser, so that other members of their
         team can recognise them.</documentation>
       <prompt prompt="Avatar" locale="en_GB.UTF-8"/>
@@ -584,6 +578,9 @@ version="0.1.1">
     </property>
     <property type="string" name="phone" column="phone" size="16"
     distinct="user">
+      <documentation>Does a canvasser record need a phone field? There is a phone
+        field on the elector record. I suppose, for under-16 canvassers, there may
+        be no elector record.</documentation>
       <prompt prompt="phone" locale="en_GB.UTF-8"/>
     </property>
     <property type="string" name="email" column="email" size="128"