ledger fixes
This commit is contained in:
@@ -24,17 +24,20 @@
|
||||
{:redirect "/login"
|
||||
:db (assoc db/default-db
|
||||
:active-page :login
|
||||
:last-client-id (.getItem js/localStorage "last-client-id")
|
||||
:user token)}
|
||||
|
||||
(and token (= "none" (or (get (jwt->data token) "role") (get (jwt->data token) "user/role")) ))
|
||||
{:redirect "/needs-activation"
|
||||
:db (assoc db/default-db
|
||||
:active-page :needs-activation
|
||||
:last-client-id (.getItem js/localStorage "last-client-id")
|
||||
:user token)}
|
||||
|
||||
:else
|
||||
{:db (assoc db/default-db
|
||||
:active-page handler
|
||||
:last-client-id (.getItem js/localStorage "last-client-id")
|
||||
:query-params (->> (:query (url (.-location js/window)))
|
||||
(map (fn [[k v]] [(keyword k) v]))
|
||||
(into {}))
|
||||
@@ -81,11 +84,16 @@
|
||||
(assoc :clients (by :id clients) )
|
||||
(assoc :vendors (by :id vendors) )
|
||||
(assoc :accounts accounts )
|
||||
(assoc :client (when (= 1 (count clients)) (->> clients first :id ))))))
|
||||
(assoc :client (or (when (= 1 (count clients)) (->> clients first :id ))
|
||||
(->> clients
|
||||
(map :id)
|
||||
(filter #(= % (:last-client-id db)))
|
||||
first))))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
::swap-client
|
||||
(fn [db [_ client]]
|
||||
(.setItem js/localStorage "last-client-id" (:id client))
|
||||
(assoc db :client (:id client))))
|
||||
|
||||
(re-frame/reg-event-db
|
||||
|
||||
Reference in New Issue
Block a user