From a70ea57a8d0dbefe93dd0df506dae926dcd74942 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 24 Jan 2014 15:48:11 +0100 Subject: [PATCH] Bug 6254: QA FIX: remove trailing whitespaces This patch removes trailing whitespaces/tab and fix the fields order in the updatedb entry (according to the kohastructure.pl). Signed-off-by: Jonathan Druart --- installer/data/mysql/updatedatabase.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 678ca77..7d7bc1a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7947,7 +7947,7 @@ if (CheckVersion($DBversion)) { $DBversion = "3.15.00.XXX"; if(CheckVersion($DBversion)) { - $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER categorycode"); + $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER category_type"); print "Upgrade to $DBversion done (Bug 6254 - can't set patron privacy by default)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index 5864f6a..f22941d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -247,7 +247,7 @@ [% IF ( delete_confirm ) %]
- + [% IF ( patrons_in_category > 0 ) %] Category [% categorycode |html %] is in use. Deletion not possible! [% ELSE %] -- 1.7.10.4