From 9d086f7028064cb77c741c0ba13cae5537f59e3b Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Fri, 29 Jun 2018 18:40:29 +0100
Subject: [PATCH] Minor fixes and tidyings

---
 src/adl/to_psql.clj             |  4 ++--
 src/adl/to_selmer_routes.clj    |  2 +-
 src/adl/to_selmer_templates.clj | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/adl/to_psql.clj b/src/adl/to_psql.clj
index ee7f549..f7aea86 100644
--- a/src/adl/to_psql.clj
+++ b/src/adl/to_psql.clj
@@ -447,8 +447,8 @@
 (defn construct-link-property
   [entity]
   {:tag :property
-   :attrs {:name (safe-name (str (:name (:attrs entity)) "_id") :sql)
-           :column (safe-name (str (:name (:attrs entity)) "_id") :sql)
+   :attrs {:name (safe-name (str (singularise (:name (:attrs entity))) "_id") :sql)
+           :column (safe-name (str (singularise (:name (:attrs entity))) "_id") :sql)
            :type "entity"
            :entity (:name (:attrs entity))
            :farkey (safe-name (first (key-names entity)) :sql)}})
diff --git a/src/adl/to_selmer_routes.clj b/src/adl/to_selmer_routes.clj
index acaa24f..50a1585 100644
--- a/src/adl/to_selmer_routes.clj
+++ b/src/adl/to_selmer_routes.clj
@@ -150,7 +150,7 @@
         'auto-selmer-routes
         (cons
           '(GET
-             "/index"
+             "/admin"
              request
              (route/restricted
                (apply (resolve-handler "index") (list request))))
diff --git a/src/adl/to_selmer_templates.clj b/src/adl/to_selmer_templates.clj
index c8d6d3e..b4feb07 100644
--- a/src/adl/to_selmer_templates.clj
+++ b/src/adl/to_selmer_templates.clj
@@ -405,9 +405,11 @@
                      "time" "time"
                      "text")
         base-name (:property (:attrs field))
-        search-name (if
-                      (= (:type (:attrs property)) "entity")
-                      (str base-name "_expanded") base-name)]
+        search-name (safe-name
+                      (if
+                        (= (:type (:attrs property)) "entity")
+                        (str base-name "_expanded") base-name)
+                      :sql)]
     (hash-map
       :tag :th
       :content
@@ -480,16 +482,17 @@
              {:tag :td :content
               (let
                [p (first (filter #(= (:name (:attrs %)) (:property (:attrs field))) (all-properties entity)))
+                s (safe-name (:name (:attrs p)) :sql)
                 e (first
                     (filter
                       #(= (:name (:attrs %)) (:entity (:attrs p)))
                       (children-with-tag application :entity)))
-                c (str "{{ record." (:property (:attrs field)) " }}")]
+                c (str "{{ record." s " }}")]
                (if
                  (= (:type (:attrs p)) "entity")
                  [{:tag :a
                    :attrs {:href (edit-link e application (list (:name (:attrs p))))}
-                   :content [(str "{{ record." (:property (:attrs field)) "_expanded }}")]}]
+                   :content [(str "{{ record." s "_expanded }}")]}]
                  [c]))})
            (children-with-tag list-spec :field))
          [{:tag :td