From 90fdd8bad05564364b5c8d40f46e0cf1b3ceaa5c 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 Signed-off-by: Katrin Fischer --- 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 0ffb746..4eda4ce 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 bfd3b4f..222623e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -99,7 +99,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 1f528c8..4e6d907 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -384,7 +384,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.7.4