Attachment 148651 Details for Bug 30418 – Bug 30418: (follow-up) Fixes for QA test tools

[patch] Bug 30418: (follow-up) Fixes for QA test tools

Bug-30418-follow-up-Fixes-for-QA-test-tools.patch (text/plain), 2.28 KB, created by Kyle M Hall (khall) on 2023-03-24 10:53:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-03-24 10:53:01 UTC

Size: 2.28 KB

patch

obsolete

>From e7b16120fef5c65b5c7114048741740202647c9c Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Mon, 13 Feb 2023 16:09:04 +0000
>Subject: [PATCH] Bug 30418: (follow-up) Fixes for QA test tools
>
>Sponsored-by: Catalyst IT, New Zealand
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> Koha/Schema/Result/Virtualshelve.pm            | 4 ++++
> installer/data/mysql/atomicupdate/bug_30418.pl | 6 +++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Schema/Result/Virtualshelve.pm b/Koha/Schema/Result/Virtualshelve.pm
>index 6fc6e765f07..b2cd76ec4f5 100644
>--- a/Koha/Schema/Result/Virtualshelve.pm
>+++ b/Koha/Schema/Result/Virtualshelve.pm
>@@ -237,5 +237,9 @@ __PACKAGE__->add_columns(
>     '+allow_change_from_staff' => { is_boolean => 1 },
> );
> 
>+__PACKAGE__->add_columns(
>+    '+allow_change_from_permitted_staff' => { is_boolean => 1 },
>+);
>+
> # You can replace this text with custom code or comments, and it will be preserved on regeneration
> 1;
>diff --git a/installer/data/mysql/atomicupdate/bug_30418.pl b/installer/data/mysql/atomicupdate/bug_30418.pl
>index f4c425a08cc..ca346112a61 100755
>--- a/installer/data/mysql/atomicupdate/bug_30418.pl
>+++ b/installer/data/mysql/atomicupdate/bug_30418.pl
>@@ -7,10 +7,10 @@ return {
>         my ($args) = @_;
>         my ($dbh, $out) = @$args{qw(dbh out)};
> 
>-	if( !column_exists( 'virtualshelves', 'allow_change_from_permitted_staff' ) ) {
>-	    $dbh->do(q{ALTER TABLE virtualshelves ADD COLUMN `allow_change_from_permitted_staff` tinyint(1) DEFAULT '0' COMMENT 'can staff with edit_public_list_contents permission change contents?'});
>+        if( !column_exists( 'virtualshelves', 'allow_change_from_permitted_staff' ) ) {
>+            $dbh->do(q{ALTER TABLE virtualshelves ADD COLUMN `allow_change_from_permitted_staff` tinyint(1) DEFAULT '0' COMMENT 'can staff with edit_public_list_contents permission change contents?'});
>         }
> 
>-	$dbh->do(q{ INSERT IGNORE INTO permissions (module_bit, code, description) VALUES (20, 'edit_public_list_contents', 'Edit public list contents') });
>+        $dbh->do(q{ INSERT IGNORE INTO permissions (module_bit, code, description) VALUES (20, 'edit_public_list_contents', 'Edit public list contents') });
>     },
> };
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30418: 139696 | 139697 | 139698 | 139699 | 139700 | 139701 | 146363 | 146364 | 146365 | 146366 | 146367 | 146368 | 146374 | 146375 | 146376 | 146377 | 146378 | 146379 | 146609 | 148645 | 148646 | 148647 | 148648 | 148649 | 148650 | 148651 | 148652 | 151249