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

Fixed the 'duplicate canvassers role' issue...

Browse source 
And the cause wasn't at all what I thought.
This commit is contained in:
Simon Brooke 2018-10-04 10:59:11 +01:00
parent 918a8205e9
commit e411eb38b2
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/sql/queries.sql
View file

@ -79,7 +79,7 @@ AND visits.id = :id
-- :name list-roles-by-canvasser :? :* -- :name list-roles-by-canvasser :? :*
-- :doc links all existing canvasser records related to a given role -- :doc links all existing canvasser records related to a given role
SELECT roles.* SELECT DISTINCT roles.*
FROM roles, ln_canvassers_roles FROM roles, ln_canvassers_roles
WHERE roles.id = ln_canvassers_roles.role_id WHERE roles.id = ln_canvassers_roles.role_id
AND ln_canvassers_roles.canvasser_id = :id AND ln_canvassers_roles.canvasser_id = :id

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

@ -24,13 +24,14 @@
user user
(db-core/list-roles-by-canvasser db-core/*db* {:id (:id user)}))] (db-core/list-roles-by-canvasser db-core/*db* {:id (:id 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 (if
roles (layout/render "roles.html" roles
(layout/render
"roles.html"
{:title (str "Welcome " (:fullname user) ", what do you want to do?") {:title (str "Welcome " (:fullname user) ", what do you want to do?")
:user user :user user
:roles (map #(assoc % :link (safe-name (:name %) :sql)) roles)}) :roles (map #(assoc % :link (safe-name (:name %) :sql)) roles)})
(empty? roles)(response/found "/app") (assoc (response/found "/login") :session (dissoc session :user)))))
true (assoc (response/found "/login") :session (dissoc session :user)))))
(defn admins-page (defn admins-page