From b5eab7c20bb8c2d07966bf1f68eaf0a7f953222e Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 12 Dec 2013 12:24:11 -0300 Subject: [PATCH] Bug 8018: (followup) make the default more explicit This patch: - Makes the new subfield tab show maxlength=9999 as default (instead of empty-then-zero). - Updates the help to make exlpicit that 0 or empty defaults to 9999. - Assumes all the subfields created with maxlength=0 inadvertedly are meant to mean "no limit" and hence update the database to reflect that. To test (this patch and Pablo's): - Edit a MARC framework, edit some field's subfields. - Use the 'New' tab to create a new subfield (choose an unused letter). - See in "More constrains" that the "Max length" field is empty. Leave it as-is. - Save the changes (the new subfield). - Edit the field again, verify that "Max length" is 0. - Try tu use the framework and the the field/subfield just created > FAIL - Apply the patches, upgrade - Try to use the framework/field/subfield > SUCCESS (0 was converted to 9999) - Repeat from the begining, "Max length" should show 9999 on the new subfield tab. - Leave it empty, it is saved as 9999. Edit: small typo Sponsored-by: Universidad Nacionald de Cordoba Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Passes QA script and tests in t and xt. Tested: - deleting an existing subfield - adding a new subfield with new default 9999 - editing the new subfield, changing value to 8888 - deleting new subfield - adding new subfield, using 8888 as length Signed-off-by: Galen Charlton --- admin/marc_subfields_structure.pl | 1 + installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../en/modules/help/admin/marc_subfields_structure.tt | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index d347012101..0589968e76 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -276,6 +276,7 @@ if ( $op eq 'add_form' ) { my %row_data; # get a fresh hash for the row data $row_data{'new_subfield'} = 1; $row_data{'subfieldcode'} = ''; + $row_data{'maxlength'} = 9999; $row_data{tab} = CGI::scrolling_list( -name => 'tab', diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0220b42032..ee8fc89bd1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7875,6 +7875,14 @@ $DBversion = "3.15.00.010"; if(CheckVersion($DBversion)) { $dbh->do("ALTER TABLE deleteditems DROP COLUMN marc"); print "Upgrade to $DBversion done (Bug 6331: remove obsolete column in deleteditems.marc)\n"; + SetVersion ($DBversion); +} + + +$DBversion = "3.15.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do("UPDATE marc_subfield_structure SET maxlength=9999 WHERE maxlength IS NULL OR maxlength=0;"); + print "Upgrade to $DBversion done (Bug 8018: new subfields have a default max length of zero)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt index 9308e98d0f..c949400e74 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt @@ -69,7 +69,7 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
  • Max length
      -
    • Define the max characters to fill.
    • +
    • Set the max characters allowed for the subfield. If empty or 0, it defaults to 9999.
-- 2.39.5