From cd5491822557aceaf748742a38b7691b1edf38dc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 9 Feb 2021 08:44:00 +0000 Subject: [PATCH] Bug 18506: DBRev 20.11.03.001 Signed-off-by: Jonathan Druart (cherry picked from commit 91ddddd8ebefaeb079b093ae71fb02bc5481fec7) Signed-off-by: Fridolin Somers --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/shibOnly.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/shibOnly.perl diff --git a/Koha.pm b/Koha.pm index 7cf42863fd..ac26ec9418 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 = "20.11.03.000"; +$VERSION = "20.11.03.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/shibOnly.perl b/installer/data/mysql/atomicupdate/shibOnly.perl deleted file mode 100644 index 47130cf597..0000000000 --- a/installer/data/mysql/atomicupdate/shibOnly.perl +++ /dev/null @@ -1,6 +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 ('OPACShibOnly','0','If ON enables shibboleth only authentication for the opac','','YesNo'),('staffShibOnly','0','If ON enables shibboleth only authentication for the staff client','','YesNo')" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug XXXXX - shibOnly preferences)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 99c38b69a0..d8c96a2438 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23465,6 +23465,17 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, "", "Koha 20.11.03 release" ); } +$DBversion = '20.11.03.001'; +if ( CheckVersion($DBversion) ) { + $dbh->do( q{ + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) + VALUES + ('OPACShibOnly','0','If ON enables shibboleth only authentication for the opac','','YesNo'), + ('staffShibOnly','0','If ON enables shibboleth only authentication for the staff client','','YesNo') + } ); + NewVersion( $DBversion, 18506, "Add OPACShibOnly and staffShibOnly system preferences" ); +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.39.5