From 5969d48392ae1b2740ace26b7c9efd3c1ce5b638 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 22 Aug 2023 15:09:17 +0000 Subject: [PATCH] Bug 34589: Only update users if permission is added MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: 1 - Assign a user 'edit_items' permission 2 - Manually run the update perl -e 'use C4::Installer; warn Data::Dumper::Dumper(C4::Installer::run_db_rev("installer/data/mysql/db_revs/221200003.pl"));' 3 - Edit patron permissions 4 - Note they now have edit_any_item permission 5 - Remove that permission 6 - Run the update again 7 - Edit patron permissions 8 - They have edit_any_item again - remove it 9 - Apply patch 10 - Run the update 11 - Edit patron permissions 12 - No new permissions added! 13 - sudo koha-mysql kohadev DELETE FROM permissions WHERE code = 'edit_any_item' 14 - Run the update again 15 - Edit patron permissions 16 - They do have edit_any_item Signed-off-by: Émily-Rose Francoeur Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 2bdfe69df80d2028563eda175d6f9a0db4d0b19d) Signed-off-by: Fridolin Somers --- installer/data/mysql/db_revs/221200003.pl | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/db_revs/221200003.pl b/installer/data/mysql/db_revs/221200003.pl index 2df9e03d06..672e9cc674 100755 --- a/installer/data/mysql/db_revs/221200003.pl +++ b/installer/data/mysql/db_revs/221200003.pl @@ -7,18 +7,22 @@ return { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; - $dbh->do(q{ + my $permission_added = $dbh->do(q{ INSERT IGNORE INTO permissions (module_bit, code, description) VALUES ( 9, 'edit_any_item', 'Edit any item reguardless of home library'); }); - say $out "Added new permission 'edit_any_item'"; - $dbh->do(q{ - INSERT IGNORE INTO user_permissions ( borrowernumber, module_bit, code ) - SELECT borrowernumber, '9', 'edit_any_item' - FROM user_permissions - WHERE module_bit = '9' - AND code = 'edit_items' - }); + if( $permission_added == 1 ){ + say $out "Added new permission 'edit_any_item'"; + + $dbh->do(q{ + INSERT IGNORE INTO user_permissions ( borrowernumber, module_bit, code ) + SELECT borrowernumber, '9', 'edit_any_item' + FROM user_permissions + WHERE module_bit = '9' + AND code = 'edit_items' + }); + say $out "Added 'edit_any_item' permission to users with edit items permission"; + } if ( !column_exists( 'library_groups', 'ft_limit_item_editing' ) ) { $dbh->do(q{ -- 2.39.5