From c6e021b998e8d96069dd7f00ab696b036b8b6301 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 11 Dec 2014 12:07:17 +0100 Subject: [PATCH] Bug 10753: Any library is represented by an empty string And not with "__ANY__" Test plan: 0/ Don't apply this patch 1/ Create a suggestion for "any library" 2/ Verify suggestions.branchcode contain "__ANY__" 3/ Apply this patch and execute the updatedb entry 4/ Create a suggestion for "any library" 5/ Verify suggestions.branchcode contain "" (for both suggestions). --- installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index cf17e0b..4985959 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9585,6 +9585,15 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$dbversion = "3.19.00.XXX"; +if ( checkversion($dbversion) ) { + $dbh->do(q| + UPDATE suggestions SET branchcode="" WHERE branchcode="__ANY__" + |); + print "upgrade to $dbversion done (Bug 10753: replace __ANY__ with empty string in suggestions.branchcode)\n"; + setversion ($dbversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index bfe0198..9693c79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -418,7 +418,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
Acquisition information
    2. -- 2.1.0