From 3bf15a5f04acbf6cdda8ef645c9b5523197c9096 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 25 Oct 2017 12:07:44 -0300 Subject: [PATCH] Bug 17381: DBRev 17.06.00.021 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../mysql/atomicupdate/bug_17381_SCOMainUserBlock.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17381_SCOMainUserBlock.perl diff --git a/Koha.pm b/Koha.pm index 3c82d0a433..8578fa07f3 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 = "17.06.00.020"; +$VERSION = "17.06.00.021"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17381_SCOMainUserBlock.perl b/installer/data/mysql/atomicupdate/bug_17381_SCOMainUserBlock.perl deleted file mode 100644 index 94a5d61483..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17381_SCOMainUserBlock.perl +++ /dev/null @@ -1,9 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - $dbh->do("INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type` ) VALUES ('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea')" ); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 17381 - Add system preference SCOMainUserBlock)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 08db4e3744..5b3a192d27 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14873,7 +14873,15 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 19028: Add 'shelving location' to holdings table in detail page (Rename syspref OpacLocationBranchToDisplayShelving with OpacLocationOnDetail))\n"; } +$DBversion = '17.06.00.021'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type` ) VALUES ('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17381 - Add system preference SCOMainUserBlock)\n"; +} # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 -- 2.39.5