From 8facb67bc9c138a06de75b713418643d6f56ef4c Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Wed, 19 Sep 2018 14:30:55 +0100
Subject: [PATCH] Getting some property names wrong: probable fix
---
src/adl/to_selmer_routes.clj | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/adl/to_selmer_routes.clj b/src/adl/to_selmer_routes.clj
index 7779a43..33f76af 100644
--- a/src/adl/to_selmer_routes.clj
+++ b/src/adl/to_selmer_routes.clj
@@ -77,7 +77,7 @@
'if
(list
'all-keys-present?
- 'params (set (map #(safe-name % :sql) (key-names e true))))
+ 'params (set (map #(keyword (safe-name % :sql)) (key-names e true))))
(list
'support/do-or-log-error
(list
@@ -288,13 +288,16 @@
(vector 'request)
(list 'let (vector
'params
- (list 'support/massage-params 'request))
+ (list
+ 'merge
+ (property-defaults e)
+ (list 'support/massage-params 'request)))
(list
'l/render
(list 'support/resolve-template (str (path-part f e a) ".html"))
(list 'merge
{:title (capitalise (:name (:attrs f)))
- :params (list 'merge (property-defaults e) 'params)}
+ :params 'params}
(case (:tag f)
:form (make-form-get-handler-content f e a n)
:page (make-page-get-handler-content f e a n)