From bfb89695aa90bcb6d8c26c0a59ee68f92dd54df9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 23 Jul 2020 10:41:23 +0200 Subject: [PATCH] Bug 23797: DBRev 20.06.00.015 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- ...97-move-OpacLoginInstructions-to-news.perl | 30 ------------------ installer/data/mysql/updatedatabase.pl | 31 +++++++++++++++++++ 3 files changed, 32 insertions(+), 31 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23797-move-OpacLoginInstructions-to-news.perl diff --git a/Koha.pm b/Koha.pm index 60d510e41d..b92e77a8dd 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.06.00.014"; +$VERSION = "20.06.00.015"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23797-move-OpacLoginInstructions-to-news.perl b/installer/data/mysql/atomicupdate/bug_23797-move-OpacLoginInstructions-to-news.perl deleted file mode 100644 index 49d33f92c5..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23797-move-OpacLoginInstructions-to-news.perl +++ /dev/null @@ -1,30 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - # get list of installed translations - require C4::Languages; - my @langs; - my $tlangs = C4::Languages::getTranslatedLanguages(); - - foreach my $language ( @$tlangs ) { - foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) { - push @langs, $sublanguage->{'rfc4646_subtag'}; - } - } - - # Get any existing value from the OpacLoginInstructions system preference - my ($opaclogininstructions) = $dbh->selectrow_array( q| - SELECT value FROM systempreferences WHERE variable='OpacLoginInstructions'; - |); - if( $opaclogininstructions ){ - foreach my $lang ( @langs ) { - print "Inserting OpacLoginInstructions contents into $lang news item...\n"; - # If there is a value in the OpacLoginInstructions preference, insert it into opac_news - $dbh->do("INSERT INTO opac_news (branchcode, lang, title, content ) VALUES (NULL, ?, '', ?)", undef, "OpacLoginInstructions_$lang", $opaclogininstructions); - } - } - # Remove the OpacLoginInstructions system preference - $dbh->do("DELETE FROM systempreferences WHERE variable='OpacLoginInstructions'"); - SetVersion ($DBversion); - print "Upgrade to $DBversion done (Bug 23797: Convert OpacLoginInstructions system preference to news block)\n"; -} \ No newline at end of file diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a3facb9c1e..c809a04dce 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22444,6 +22444,37 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 23797, "Extend the opac_news lang column to accommodate longer values" ); } +$DBversion = '20.06.00.015'; +if( CheckVersion( $DBversion ) ) { + + # get list of installed translations + require C4::Languages; + my @langs; + my $tlangs = C4::Languages::getTranslatedLanguages('opac','bootstrap'); + + foreach my $language ( @$tlangs ) { + foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) { + push @langs, $sublanguage->{'rfc4646_subtag'}; + } + } + + # Get any existing value from the OpacLoginInstructions system preference + my ($opaclogininstructions) = $dbh->selectrow_array( q| + SELECT value FROM systempreferences WHERE variable='OpacLoginInstructions'; + |); + if( $opaclogininstructions ){ + foreach my $lang ( @langs ) { + # If there is a value in the OpacLoginInstructions preference, insert it into opac_news + $dbh->do("INSERT INTO opac_news (branchcode, lang, title, content ) VALUES (NULL, ?, '', ?)", undef, "OpacLoginInstructions_$lang", $opaclogininstructions); + } + } + # Remove the OpacLoginInstructions system preference + $dbh->do("DELETE FROM systempreferences WHERE variable='OpacLoginInstructions'"); + + NewVersion( $DBversion, 23797, "Convert OpacLoginInstructions system preference to news block" ); +} + + # 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