@@ -, +, @@ --- installer/data/mysql/updatedatabase.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/installer/data/mysql/updatedatabase.pl +++ a/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); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ a/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 %] --