From 8048acf2255034bac433c654e66597e8da24ee99 Mon Sep 17 00:00:00 2001 From: Joy Nelson Date: Mon, 11 May 2020 21:52:39 +0000 Subject: [PATCH] Bug 25184: DBRev 19.11.05.005 Signed-off-by: Joy Nelson --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_25184.perl | 11 ----------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_25184.perl diff --git a/Koha.pm b/Koha.pm index c98af681c2..72a236b73e 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.11.05.004"; +$VERSION = "19.11.05.005"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_25184.perl b/installer/data/mysql/atomicupdate/bug_25184.perl deleted file mode 100644 index af823f47f3..0000000000 --- a/installer/data/mysql/atomicupdate/bug_25184.perl +++ /dev/null @@ -1,11 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" ); - $dbh->do(q{ - INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('TrapHoldsOnOrder','1',NULL,'If enabled, Koha will trap holds for on order items ( notforloan < 0 )','YesNo't c) - }); - - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 25184, "Items with a negative notforloan status should not be captured for holds"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1452667276..1648a48771 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20511,6 +20511,16 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 23081: Set default to 0 for items.issues)\n"; } +$DBversion = '19.11.05.005'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES + ('TrapHoldsOnOrder','1',NULL,'If enabled, Koha will trap holds for on order items ( notforloan < 0 )','YesNo') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 25184: Items with a negative notforloan status should not be captured for holds)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5