From a4dea8c8b802bf5e1b4985762885565ad7c49e75 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 4 Jun 2019 10:06:46 +0100 Subject: [PATCH] Bug 22960: DBRev 19.05.00.001 Signed-off-by: Martin Renvoize (cherry picked from commit 4ae854242839ebe9871b65fe0add2241eb4ae0b7) Signed-off-by: Fridolin Somers --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_22960_fix_typo_in_syspref.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22960_fix_typo_in_syspref.perl diff --git a/Koha.pm b/Koha.pm index 012cb6237a..255ac9e573 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "19.05.00.000"; +$VERSION = "19.05.00.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22960_fix_typo_in_syspref.perl b/installer/data/mysql/atomicupdate/bug_22960_fix_typo_in_syspref.perl deleted file mode 100644 index babb623e0a..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22960_fix_typo_in_syspref.perl +++ /dev/null @@ -1,6 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "UPDATE systempreferences SET explanation = REPLACE(explanation,'locaiton','location') WHERE variable = 'UpdateItemLocationOnCheckin'" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22960: Fix typo in syspref description)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index b9fb6cc7ac..68377537fb 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -18682,6 +18682,16 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (19.05.00 release)\n"; } +$DBversion = '19.05.00.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( q{ + UPDATE systempreferences + SET explanation = 'This is a list of value pairs.\n Examples:\n PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\n FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n _BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned. The special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.' + WHERE variable = 'UpdateItemLocationOnCheckin' + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22960: Fix typo in syspref description)\n"; +} # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.11.4.GIT