notid/integreat
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge branch 'integreat-assorted' into staging

Browse Source
This commit is contained in:
Bryce
2026-05-26 23:20:45 -07:00
parent 4fca49bff0 2f9da3cdd9
commit de933699aa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clj/auto_ap/ssr/components/aside.clj
View File

@@ -80,7 +80,7 @@
(defn- transaction-nav-url [request route & {:keys [default-params] :or {default-params {:date-range "month"}}}] (defn- transaction-nav-url [request route & {:keys [default-params] :or {default-params {:date-range "month"}}}]
(let [preserved (transaction-nav-params request)] (let [preserved (transaction-nav-params request)]
(hu/url (bidi/path-for ssr-routes/only-routes route) (hu/url (bidi/path-for ssr-routes/only-routes route)
(if (or (:start-date preserved) (:end-date preserved)) #_(if (or (:start-date preserved) (:end-date preserved))
preserved preserved
(merge default-params preserved))))) (merge default-params preserved)))))
@@ -316,7 +316,7 @@
(list (list
(menu-button- {"@click.prevent" "if (selected == 'ledger') {selected = null } else { selected = 'ledger'} " (menu-button- {"@click.prevent" "if (selected == 'ledger') {selected = null } else { selected = 'ledger'} "
:icon svg/receipt} :icon svg/receipt}
"Ledger") "Reports")
(sub-menu- {:selector "ledger" (sub-menu- {:selector "ledger"
:active? (= "ledger" selected)} :active? (= "ledger" selected)}
(menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes (menu-button- {:href (hu/url (bidi/path-for ssr-routes/only-routes

2
src/clj/auto_ap/ssr/payments.clj
View File

@@ -230,7 +230,7 @@
true true
(merge-query {:query {:find ['?sort-default '?e]}})))] (merge-query {:query {:find ['?sort-default '?e]}})))]
(cond->> (observable-query query) (cond->> (observable-query query)
true (apply-sort-3 query-params) true (apply-sort-3 (assoc query-params :default-asc? false))
true (apply-pagination query-params)))) true (apply-pagination query-params))))
(defn hydrate-results [ids db _] (defn hydrate-results [ids db _]