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

Merge branch 'develop' into feature/2

Browse source
This commit is contained in:
Simon Brooke 2018-08-08 12:48:09 +01:00
parent a6abeaa679 f6d7f238e9
commit 2806d3c28c
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/templates/base.html
View file

@ -46,7 +46,7 @@
<div class="error"> <div class="error">
{{ error }} {{ error }}
</div> </div>
{% endif %} {% if error %}
</header> </header>
{% endblock %} {% endblock %}
<div id="main-container" class="container"> <div id="main-container" class="container">

2
src/clj/youyesyet/routes/roles.clj
View file

@ -22,7 +22,7 @@
user (-> request :session :user) user (-> request :session :user)
roles (if roles (if
user 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)) (log/info (str "Roles routing page; user is " user "; roles are " roles))
(cond (cond
roles (layout/render "roles.html" roles (layout/render "roles.html"

1
youyesyet.adl.xml
View file

@ -782,6 +782,7 @@ version="0.1.1">
</entity> </entity>
<entity table="teams" name="teams" magnitude="4" volatility="4"> <entity table="teams" name="teams" magnitude="4" volatility="4">
<documentation>Organised teams of canvassers who canvass together.</documentation>
<key> <key>
<property type="integer" name="id" column="id" <property type="integer" name="id" column="id"
distinct="system" immutable="true"> distinct="system" immutable="true">