From 3865b14a57c4e0d4547980acf67060eac181161f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 17 Apr 2013 09:33:55 -0400 Subject: [PATCH] Bug 9533: batch item modification form now shows default field values only by request This patch makes the pre-population of the fields for the batch item editor with the default values from the default framework optional and off by default. Test Plan: 1) Apply patch 2) Add default values for cost and replacement cost to the default framework. 3) Browse to Tools / Batch item modification 4) Choose a file, or entire some barcodes in the text area 5) Ensure that the 'Populate fields with default values from default framework' is *not* checked 6) Click 'Continue' 7) Observe that the fields for cost and replacement cost are blank 8) Click the 'back' button on your browser 9) Check the checkbox to enable the default value 10) Click 'Continue' 11) Observe that the fields for cost and replacement cost now contain the default values you assigned them in the default MARC framework Signed-off-by: David Cook Signed-off-by: Katrin Fischer Switch works correctly, all tests and QA script pass. Note: there is a bug with default values for all non text input fields. Default values won't be applied for those fields as the pull downs are not preselected correctly with the default values defined in the framework. Signed-off-by: Galen Charlton (cherry picked from commit 2d32ab38148f7d75412a36e928dea799717bc5fb) Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/tools/batchMod.tt | 14 ++++++++++++++ tools/batchMod.pl | 7 +++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt index ed57366ce0..3f9b31312a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt @@ -43,11 +43,25 @@ + +
+ Use default values +
    +
  1. + +
  2. +
+
+ [% IF ( del ) %][% END %]
Cancel
+ diff --git a/tools/batchMod.pl b/tools/batchMod.pl index e416d444da..840ae17697 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -47,7 +47,7 @@ my $del_records = $input->param('del_records'); my $completedJobID = $input->param('completedJobID'); my $runinbackground = $input->param('runinbackground'); my $src = $input->param('src'); - +my $use_default_values = $input->param('use_default_values'); my $template_name; my $template_flag; @@ -78,8 +78,7 @@ my $itemrecord; my $nextop=""; my @errors; # store errors found while checking data BEFORE saving item. my $items_display_hashref; -my $frameworkcode=""; -my $tagslib = &GetMarcStructure(1,$frameworkcode); +my $tagslib = &GetMarcStructure(1); my $deleted_items = 0; # Number of deleted items my $deleted_records = 0; # Number of deleted records ( with no items attached ) @@ -309,7 +308,7 @@ foreach my $tag (sort keys %{$tagslib}) { $subfield_data{repeatable} = $tagslib->{$tag}->{$subfield}->{repeatable}; my ($x,$value); $value =~ s/"/"/g; - unless ($value) { + if ( !$value && $use_default_values) { $value = $tagslib->{$tag}->{$subfield}->{defaultvalue}; # get today date & replace YYYY, MM, DD if provided in the default value my ( $year, $month, $day ) = split ',', $today_iso; # FIXME: iso dates don't have commas! -- 2.39.5