simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Minor fixes discovered while working on the record loading problem

Browse source
This commit is contained in:
Simon Brooke 2018-09-19 15:14:22 +01:00
parent 7ce041ad0c
commit 7a791f50f4
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/clj/youyesyet/middleware.clj
View file

@ -69,10 +69,8 @@
(fn [request] (fn [request]
(if-let [user (-> request :session :user)] (if-let [user (-> request :session :user)]
(binding [*user* user] (binding [*user* user]
(log/debug "*user* bound as: " *user*)
(handler request)) (handler request))
(do (do
(log/debug "No user found in session")
(handler request))))) (handler request)))))

11
youyesyet.adl.xml
View file

@ -231,9 +231,6 @@ version="0.1.1">
column="postcode" size="16" distinct="user"> column="postcode" size="16" distinct="user">
<prompt prompt="Postcode" locale="en_GB.UTF-8"/> <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
</property> </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" <property type="entity" name="district_id" column="district_id"
entity="districts" farkey="id"> entity="districts" farkey="id">
<prompt prompt="District" locale="en_GB.UTF-8"/> <prompt prompt="District" locale="en_GB.UTF-8"/>
@ -276,9 +273,6 @@ version="0.1.1">
<field property="postcode"> <field property="postcode">
<prompt prompt="Postcode" locale="en_GB.UTF-8"/> <prompt prompt="Postcode" locale="en_GB.UTF-8"/>
</field> </field>
<field property="phone">
<prompt prompt="Phone" locale="en_GB.UTF-8"/>
</field>
<field property="district_id"> <field property="district_id">
<prompt prompt="District" locale="en_GB.UTF-8"/> <prompt prompt="District" locale="en_GB.UTF-8"/>
</field> </field>
@ -564,7 +558,7 @@ version="0.1.1">
column="fullname" size="64" distinct="user"> column="fullname" size="64" distinct="user">
<prompt prompt="fullname" locale="en_GB.UTF-8"/> <prompt prompt="fullname" locale="en_GB.UTF-8"/>
</property> </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 <documentation>An image of the canvasser, so that other members of their
team can recognise them.</documentation> team can recognise them.</documentation>
<prompt prompt="Avatar" locale="en_GB.UTF-8"/> <prompt prompt="Avatar" locale="en_GB.UTF-8"/>
@ -584,6 +578,9 @@ version="0.1.1">
</property> </property>
<property type="string" name="phone" column="phone" size="16" <property type="string" name="phone" column="phone" size="16"
distinct="user"> 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"/> <prompt prompt="phone" locale="en_GB.UTF-8"/>
</property> </property>
<property type="string" name="email" column="email" size="128" <property type="string" name="email" column="email" size="128"