From 715da06db557edc4b1baa51cc278fdac362c01c4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 30 Jan 2020 08:34:06 +0000 Subject: [PATCH] Bug 22868: DBRev 19.12.00.016 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_22868.perl | 19 ------------------ installer/data/mysql/updatedatabase.pl | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22868.perl diff --git a/Koha.pm b/Koha.pm index 18b417c258..0d6acad667 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.12.00.015"; +$VERSION = "19.12.00.016"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22868.perl b/installer/data/mysql/atomicupdate/bug_22868.perl deleted file mode 100644 index ab4853dc45..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22868.perl +++ /dev/null @@ -1,19 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO `userflags` (`bit`, `flag`, `flagdesc`, `defaulton`) - VALUES (12, 'suggestions', 'Suggestion management', 0) - }); - - $dbh->do(q{ - UPDATE permissions SET module_bit=12 - WHERE code="suggestions_manage" - }); - - $dbh->do(q{ - UPDATE borrowers SET flags = flags + (1<<12) WHERE flags & (1 << 11) - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22868 - Move suggestions_manage subpermission out of acquisition permission)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 3e6a208ff1..e4fa236c0a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20640,6 +20640,26 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24296 - Update stockrotation to use 'reason' field in transfers table)\n"; } +$DBversion = '19.12.00.016'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `userflags` (`bit`, `flag`, `flagdesc`, `defaulton`) + VALUES (12, 'suggestions', 'Suggestion management', 0) + }); + + $dbh->do(q{ + UPDATE permissions SET module_bit=12 + WHERE code="suggestions_manage" + }); + + $dbh->do(q{ + UPDATE borrowers SET flags = flags + (1<<12) WHERE flags & (1 << 11) + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22868 - Move suggestions_manage subpermission out of acquisition permission)\n"; +} + # 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.20.1