From 2c2e29463a73fa1ece1808378013160347036143 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 2 Apr 2018 18:05:39 -0300 Subject: [PATCH] Bug 20291: DBRev 17.12.00.025 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- ...91_add_StaffLoginInstructions_preference.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20291_add_StaffLoginInstructions_preference.perl diff --git a/Koha.pm b/Koha.pm index d858a87ac5..d53c392cc8 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.12.00.024"; +$VERSION = "17.12.00.025"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20291_add_StaffLoginInstructions_preference.perl b/installer/data/mysql/atomicupdate/bug_20291_add_StaffLoginInstructions_preference.perl deleted file mode 100644 index 4844bdbf0d..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20291_add_StaffLoginInstructions_preference.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,explanation,options,type) VALUES ('StaffLoginInstructions','','HTML to go into the login box for the staff client',NULL,'Free')"); - $dbh->do("UPDATE systempreferences SET variable = 'OpacLoginInstructions' WHERE variable = 'NoLoginInstructions'"); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 20291 - Add StaffLoginInstructions system preference)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a498721ab9..0f014f93e2 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -15707,6 +15707,22 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 15492: Add a standalone self-checkin module)\n"; } +$DBversion = '17.12.00.025'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q| + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES ('StaffLoginInstructions','','HTML to go into the login box for the staff client',NULL,'Free') + |); + $dbh->do(q| + UPDATE systempreferences + SET variable = 'OpacLoginInstructions' + WHERE variable = 'NoLoginInstructions' + |); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20291 - Add StaffLoginInstructions system preference and rename NoLoginInstructions with OpacLoginInstructions)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1