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 227f564fd5..81744ca459 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7847,6 +7847,14 @@ $DBversion = "3.14.01.004"; if(CheckVersion($DBversion)) { $dbh->do("ALTER TABLE deleteditems DROP COLUMN marc"); print "Upgrade to $DBversion done (Bug 6331: Obsolete marc column in deleteditems)\n"; + 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