removed redundant stuff.
This commit is contained in:
@@ -240,7 +240,8 @@
|
||||
:schema schema
|
||||
:on-change (fn [expense-accounts original-expense-accounts]
|
||||
(let [updated-expense-accounts
|
||||
(for [[before-account after-account] (map vector original-expense-accounts expense-accounts)]
|
||||
(for [[before-account after-account] (map vector (concat original-expense-accounts
|
||||
(repeat nil)) expense-accounts)]
|
||||
(cond-> after-account
|
||||
(not= (:id (:account before-account))
|
||||
(:id (:account after-account)))
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
[auto-ap.forms.builder :as form-builder]))
|
||||
|
||||
|
||||
(defn multi-field-v2-internal [{:keys [template key-fn next-key allow-change? disable-new? disable-remove? schema on-change disabled new-text] prop-value :value :as props} ]
|
||||
;; TODO just embrace the fact that it will need to be remounted, and use index based keys
|
||||
(defn multi-field-v2-internal [{:keys [template key-fn allow-change? disable-new? disable-remove? schema on-change disabled new-text] prop-value :value :as props} ]
|
||||
(let [prop-value (if (seq prop-value)
|
||||
prop-value
|
||||
[])]
|
||||
@@ -18,17 +19,23 @@
|
||||
:on-change on-change}
|
||||
[:fieldset {:disabled disabled}
|
||||
[:div {:style {:margin-bottom "0.25em"}}
|
||||
(into [appearing-group]
|
||||
(into [(if key-fn
|
||||
appearing-group
|
||||
[:<>])]
|
||||
(for [[i override] (map vector (range) prop-value)
|
||||
:let [extant? (boolean (key-fn override))
|
||||
:let [extant? (if key-fn
|
||||
(boolean (key-fn override))
|
||||
true)
|
||||
is-disabled? (boolean (and (= false allow-change?)
|
||||
extant?))]]
|
||||
|
||||
^{:key (or (key-fn override)
|
||||
(::key override))}
|
||||
^{:key (or (when key-fn (key-fn override))
|
||||
(::key override)
|
||||
i)}
|
||||
[form-builder/with-scope {:scope [i]}
|
||||
^{:key (or (key-fn override)
|
||||
(::key override))}
|
||||
^{:key (or (when key-fn (key-fn override))
|
||||
(::key override)
|
||||
i)}
|
||||
[:div.level {:style {:margin-bottom "0.25em"}}
|
||||
[:div.level-left {:style {:padding "0.5em 1em"}
|
||||
:class (when-not extant?
|
||||
|
||||
Reference in New Issue
Block a user