fixes
This commit is contained in:
@@ -8,7 +8,9 @@
|
||||
[auto-ap.ssr-routes :as ssr-routes]
|
||||
[cemerick.url :as url]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.ssr.svg :as svg]))
|
||||
[auto-ap.ssr.svg :as svg]
|
||||
[unilog.context :as lc]
|
||||
[com.brunobonacci.mulog :as mu]))
|
||||
|
||||
(defn row* [gridspec user entity {:keys [flash? delete-after-settle?] :as options}]
|
||||
(let [cells (mapv (fn [header]
|
||||
@@ -51,16 +53,15 @@
|
||||
))
|
||||
"default sort"))
|
||||
|
||||
(defn table* [grid-spec user {:keys [start per-page client flash-id sort request] :as params}]
|
||||
(defn table* [grid-spec user {:keys [start per-page clients flash-id sort] :as params}]
|
||||
(let [start (or start 0)
|
||||
per-page (or per-page 30)
|
||||
[entities total] ((:fetch-page grid-spec)
|
||||
user
|
||||
{:start start
|
||||
:per-page per-page
|
||||
:client-id (:db/id client)
|
||||
:sort sort
|
||||
:request request})]
|
||||
:clients clients
|
||||
:sort sort})]
|
||||
(com/data-grid-card {:id (:id grid-spec)
|
||||
:title (:title grid-spec)
|
||||
:route (:route grid-spec)
|
||||
@@ -161,7 +162,9 @@
|
||||
q-sort (assoc :sort (parse-sort grid-spec q-sort))
|
||||
(not-empty q-toggle-sort) (update :sort #(toggle-sort grid-spec % q-toggle-sort) )
|
||||
(:session request) (assoc :session (:session request))
|
||||
(:client (:session request)) (assoc :client (:client (:session request))))))
|
||||
(:client-selection (:session request)) (assoc :client-selection (:client-selection (:session request)))
|
||||
(:clients request) (assoc :clients (:clients request))
|
||||
(:client request) (assoc :client (:client request)))))
|
||||
|
||||
(defn table [grid-spec {:keys [query-params hx-query-params identity session] :as request}]
|
||||
(let [params (extract-params grid-spec request)
|
||||
@@ -177,7 +180,8 @@
|
||||
(base-page
|
||||
request
|
||||
(com/page {:nav (:nav grid-spec)
|
||||
:active-client (:client (:session request))
|
||||
:client-selection (:client-selection (:session request))
|
||||
:client (:client request)
|
||||
:identity (:identity request)}
|
||||
(apply com/breadcrumbs {} (:breadcrumbs grid-spec))
|
||||
(table* grid-spec
|
||||
|
||||
Reference in New Issue
Block a user