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

Minor fixes and tidyings

Browse source
This commit is contained in:
Simon Brooke 2018-06-29 18:40:29 +01:00
parent 8e0ad87e04
commit 9d086f7028
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/adl/to_psql.clj
View file

@ -447,8 +447,8 @@
(defn construct-link-property (defn construct-link-property
[entity] [entity]
{:tag :property {:tag :property
:attrs {:name (safe-name (str (:name (:attrs entity)) "_id") :sql) :attrs {:name (safe-name (str (singularise (:name (:attrs entity))) "_id") :sql)
:column (safe-name (str (:name (:attrs entity)) "_id") :sql) :column (safe-name (str (singularise (:name (:attrs entity))) "_id") :sql)
:type "entity" :type "entity"
:entity (:name (:attrs entity)) :entity (:name (:attrs entity))
:farkey (safe-name (first (key-names entity)) :sql)}}) :farkey (safe-name (first (key-names entity)) :sql)}})

2
src/adl/to_selmer_routes.clj
View file

@ -150,7 +150,7 @@
'auto-selmer-routes 'auto-selmer-routes
(cons (cons
'(GET '(GET
"/index" "/admin"
request request
(route/restricted (route/restricted
(apply (resolve-handler "index") (list request)))) (apply (resolve-handler "index") (list request))))

11
src/adl/to_selmer_templates.clj
View file

@ -405,9 +405,11 @@
"time" "time" "time" "time"
"text") "text")
base-name (:property (:attrs field)) base-name (:property (:attrs field))
search-name (if search-name (safe-name
(if
(= (:type (:attrs property)) "entity") (= (:type (:attrs property)) "entity")
(str base-name "_expanded") base-name)] (str base-name "_expanded") base-name)
:sql)]
(hash-map (hash-map
:tag :th :tag :th
:content :content
@ -480,16 +482,17 @@
{:tag :td :content {:tag :td :content
(let (let
[p (first (filter #(= (:name (:attrs %)) (:property (:attrs field))) (all-properties entity))) [p (first (filter #(= (:name (:attrs %)) (:property (:attrs field))) (all-properties entity)))
s (safe-name (:name (:attrs p)) :sql)
e (first e (first
(filter (filter
#(= (:name (:attrs %)) (:entity (:attrs p))) #(= (:name (:attrs %)) (:entity (:attrs p)))
(children-with-tag application :entity))) (children-with-tag application :entity)))
c (str "{{ record." (:property (:attrs field)) " }}")] c (str "{{ record." s " }}")]
(if (if
(= (:type (:attrs p)) "entity") (= (:type (:attrs p)) "entity")
[{:tag :a [{:tag :a
:attrs {:href (edit-link e application (list (:name (:attrs p))))} :attrs {:href (edit-link e application (list (:name (:attrs p))))}
:content [(str "{{ record." (:property (:attrs field)) "_expanded }}")]}] :content [(str "{{ record." s "_expanded }}")]}]
[c]))}) [c]))})
(children-with-tag list-spec :field)) (children-with-tag list-spec :field))
[{:tag :td [{:tag :td