From 3b51af679d6c982d914e71862181d8b142eb9ef9 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 6 Sep 2024 14:20:21 +0100 Subject: [PATCH] Bug 10190: Modal form improvements We now fetch all rules on modal open and the effective rule on context selection. This allows us to compare the specific values of the rule we're adding/editing to the fallback values present in the all rules set. We use the fallback rule values as placeholders in the input boxes to highlight to the end user what value will be used should they choose to wipe the input. We also allow wiping inputs and pass 'null' to the API appropriately. Finally, we set a minimum value for delay when adding a new rule to highlight to the user that the new trigger will be added after existing triggers. Sponsored-by: Glasgow Colleges Library Group Signed-off-by: George Harkins --- .../CirculationTriggersFormAdd.vue | 437 ++++++++++++------ .../CirculationTriggers/TriggersTable.vue | 121 +++-- 2 files changed, 387 insertions(+), 171 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue index f4a6c4d1482..ff46803dc4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue @@ -12,13 +12,19 @@

{{ $__("Trigger context") }}

-

{{ $__("Existing rules") }}

-

{{ $__("Notice") }} {{ " " + newTriggerNumber - 1 }}

+

+ {{ $__("Existing rules") }} +

+

+ {{ $__("Notice") }} {{ " " + newTriggerNumber - 1 }} +

@@ -30,7 +36,7 @@ >