gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 42406: (QA follow-up) fix little inconsistencies and errors 

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
David Cook 2026-04-24 04:14:44 +00:00 committed by Lucas Gass
parent 3107cdc368
commit ea3b9d9c14
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/data/mysql/atomicupdate/bug_42406.pl
View File

@ -2,8 +2,8 @@ use Modern::Perl;
use Koha::Installer::Output qw(say_warning say_success say_info);
return {
bug_number => "BUG_NUMBER",
description => "A single line description",
bug_number => "42406",
description => "Split delete_reports into 'own' and 'all'",
up => sub {
my ($args) = @_;
my ( $dbh, $out ) = @$args{qw(dbh out)};
@ -11,8 +11,8 @@ return {
$dbh->do(
q{
INSERT IGNORE INTO permissions (module_bit, code, description) VALUES
( 16, 'delete_own_reports', 'Delete reports you have created'),
( 16, 'delete_all_reports', 'Delete any reports')
( 16, 'delete_own_reports', 'Delete SQL reports you have created'),
( 16, 'delete_all_reports', 'Delete SQL reports created by anyone')
}
);
say $out "Added new permissions 'delete_own_reports' AND 'delete_all_reports'";

4
koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
View File

@ -2,7 +2,9 @@
<div id="guided-reports-view-menu" class="sidebar_menu">
<h5>View reports</h5>
<ul>
[% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Saved reports</a></li>[% END %]
[% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports || CAN_user_reports_delete_own_reports || CAN_user_reports_delete_all_reports ) %]
<li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Saved reports</a></li>
[% END %]
</ul>
<h5>Reports dictionary</h5>
<ul>

2
koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
View File

@ -32,7 +32,7 @@
<h1>Reports</h1>
<div class="row">
<div class="col-6">
[% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %]
[% IF ( CAN_user_reports_execute_reports || CAN_user_reports_create_reports || CAN_user_reports_delete_own_reports || CAN_user_reports_delete_all_reports ) %]
<fieldset class="brief">
<h2>Guided reports</h2>
[% IF ( CAN_user_reports_create_reports ) %]

6
t/Koha/Auth/Permissions.t
View File

@ -61,7 +61,8 @@ subtest 'normal staff user test' => sub {
'CAN_user_circulate_circulate_remaining_permissions' => 1,
'CAN_user_reports' => 1,
'CAN_user_reports_create_reports' => 1,
'CAN_user_reports_delete_reports' => 1,
'CAN_user_reports_delete_own_reports' => 1,
'CAN_user_reports_delete_all_reports' => 1,
'CAN_user_reports_execute_reports' => 1,
};
is_deeply( $authz, $expected, 'Expected permissions generated for normal staff user' );
@ -233,7 +234,8 @@ subtest 'superlibrarian tests' => sub {
'CAN_user_recalls_manage_recalls' => 1,
'CAN_user_recalls' => 1,
'CAN_user_reports_create_reports' => 1,
'CAN_user_reports_delete_reports' => 1,
'CAN_user_reports_delete_own_reports' => 1,
'CAN_user_reports_delete_all_reports' => 1,
'CAN_user_reports_execute_reports' => 1,
'CAN_user_reports' => 1,
'CAN_user_reserveforothers_modify_holds_priority' => 1,