From 30ae901505ca9b033a03d2ea5bfc6b307b0799c7 Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Fri, 23 Feb 2018 15:02:50 -0500 Subject: [PATCH] Bug 8643: (QA follow-up) Fix alert, clean up patch, improve db update * Field 'important' now added after 'mandatory' in table marc_tag_structure * Removed modification on table serialitems in kohastructure.sql * Removed bogus line in marctagstructure.tt * Fixed the missing tag number in the alert message --- installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql b/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql index 0ffb746db5..4eda4ce5aa 100644 --- a/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql +++ b/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql @@ -1,5 +1,5 @@ ALTER TABLE marc_subfield_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER mandatory; -ALTER TABLE marc_tag_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER frameworkcode; +ALTER TABLE marc_tag_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER mandatory; -- $DBversion = "3.23.00.XXX"; -- if ( CheckVersion($DBversion) ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index ad8f95fd24..353bbbbd96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -92,7 +92,6 @@ [% END %] -
  • [% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 3209f63927..ef9412db7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -377,7 +377,7 @@ function AreImportantsNotOk(){ [% END %] [% FOREACH subfield_loo IN innerloo.subfield_loop %] [% IF ( subfield_loo.important ) %]importants.push("[% subfield_loo.id %]"); - tab.push("[% subfield_loo.number %]"); + tab.push("[% BIG_LOO.number %]"); label.push("[% subfield_loo.marc_lib %]"); [% END %] [% END %] -- 2.14.1