Bugzilla – Attachment 161263 Details for
Bug 35871
Adding a merge_delete_authorities subpermission for editauthorities
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35871: Adding new subpermission merge_delete_authorities
Bug-35871-Adding-new-subpermission-mergedeleteauth.patch (text/plain), 7.44 KB, created by
Wainui Witika-Park
on 2024-01-23 03:43:47 UTC
(
hide
)
Description:
Bug 35871: Adding new subpermission merge_delete_authorities
Filename:
MIME Type:
Creator:
Wainui Witika-Park
Created:
2024-01-23 03:43:47 UTC
Size:
7.44 KB
patch
obsolete
>From d1065f333afb942e2659179b58fa6175006de387 Mon Sep 17 00:00:00 2001 >From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> >Date: Tue, 23 Jan 2024 16:33:06 +1300 >Subject: [PATCH] Bug 35871: Adding new subpermission merge_delete_authorities > >Sponsored-by: Education Services Australia SCIS >--- > authorities/merge.pl | 2 +- > ...add_merge_delete_authorities_subpermission | 22 +++++++++++++++++++ > .../data/mysql/mandatory/userpermissions.sql | 1 + > .../prog/en/includes/authorities-toolbar.inc | 6 +++-- > .../prog/en/includes/permissions.inc | 5 +++++ > .../prog/en/modules/authorities/merge.tt | 8 +++++++ > .../modules/authorities/searchresultlist.tt | 8 ++++--- > 7 files changed, 46 insertions(+), 6 deletions(-) > create mode 100755 installer/data/mysql/atomicupdate/bug_35871_add_merge_delete_authorities_subpermission > >diff --git a/authorities/merge.pl b/authorities/merge.pl >index 0799c26b04..a3b2ec54e1 100755 >--- a/authorities/merge.pl >+++ b/authorities/merge.pl >@@ -39,7 +39,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > template_name => "authorities/merge.tt", > query => $input, > type => "intranet", >- flagsrequired => { editauthorities => 1 }, >+ flagsrequired => { editauthorities => 'merge_delete_authorities' }, > } > ); > >diff --git a/installer/data/mysql/atomicupdate/bug_35871_add_merge_delete_authorities_subpermission b/installer/data/mysql/atomicupdate/bug_35871_add_merge_delete_authorities_subpermission >new file mode 100755 >index 0000000000..563f145201 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_35871_add_merge_delete_authorities_subpermission >@@ -0,0 +1,22 @@ >+use Modern::Perl; >+ >+return { >+ bug_number => "35871", >+ description => "Adding a merge_delete_authorities subpermission for editauthorities", >+ up => sub { >+ my ($args) = @_; >+ my ( $dbh, $out ) = @$args{qw(dbh out)}; >+ >+ # Do you stuffs here >+ $DBversion = 'XXX'; >+ if( CheckVersion( $DBversion ) ) { >+ $dbh->do(q{INSERT IGNORE INTO permissions (module_bit, code, description) VALUES ('14','merge_delete_authorities','Merge and delete authority records')}); >+ >+ NewVersion( $DBversion, undef, "Bug 35871: Add merge_delete_authorities user subpermission" ); >+ } >+ >+ # Print useful stuff here >+ # permissions >+ say $out "Added new permission 'merge_delete_authorities'"; >+ }, >+}; >diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql >index 7e52abd262..f8037130e0 100644 >--- a/installer/data/mysql/mandatory/userpermissions.sql >+++ b/installer/data/mysql/mandatory/userpermissions.sql >@@ -119,6 +119,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'access_files', 'Access to the files stored on the server'), > (13, 'upload_general_files', 'Upload any file'), > (13, 'upload_manage', 'Manage uploaded files'), >+ (14, 'merge_delete_authorities', 'Merge and delete authority records'), > (15, 'check_expiration', 'Check the expiration of a serial'), > (15, 'claim_serials', 'Claim missing serials'), > (15, 'create_subscription', 'Create a new subscription'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 58b7ca715e..ebc3e641af 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -35,8 +35,10 @@ > [% IF servers.count > 0 %] > <li><a id="z3950_replace" href="#">Replace record via Z39.50/SRU</a></li> > [% END %] >- [% UNLESS ( count ) %] >- <li><a href="#" id="delAuth">Delete record</a></li> >+ [% IF ( CAN_user_editauthorities_merge_delete_authorities ) %] >+ [% UNLESS ( count ) %] >+ <li><a href="#" id="delAuth">Delete record</a></li> >+ [% END %] > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >index 10b90813f4..35e6b0f97c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >@@ -637,6 +637,11 @@ > Browse the system logs > </span> > <span class="permissioncode">([% name | html %])</span> >+ [%- CASE 'merge_delete_authorities' -%] >+ <span class="sub_permission merge_delete_authorities"> >+ Merge and delete authority records >+ </span> >+ <span class="permissioncode">([% name | html %])</span> > [%- CASE 'check_expiration' -%] > <span class="sub_permission check_expiration_subpermission"> > Check the expiration of a serial >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index cc2e0ffee6..24344b8e62 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -40,6 +40,8 @@ div#result { margin-top: 1em; } > > <h1>Merging records</h1> > >+[% IF CAN_user_editauthorities_merge_delete_authorities %] >+ > [% IF ( errors ) %] > > [% FOREACH error IN errors %] >@@ -119,6 +121,12 @@ div#result { margin-top: 1em; } > <fieldset class="action"><input type="submit" name="merge" class="btn btn-primary" value="Merge" /></fieldset> > </form> > >+[% END %] >+ >+[% ELSE %] >+ >+<div class="dialog alert">You do not have the required privileges to merge authorities.</div> >+ > [% END %] > > </main> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index 6d5baf41e4..d9ef6c05b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -107,9 +107,11 @@ > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]"> > <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a></li> >- <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li> >- [% UNLESS ( resul.used ) %] >- <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash-can"></i> Delete</a></li> >+ [% IF CAN_user_editauthorities_merge_delete_authorities %] >+ <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li> >+ [% UNLESS ( resul.used ) %] >+ <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash"></i> Delete</a></li> >+ [% END %] > [% END %] > <li class="authority_preview"> > <a data-authid="[% resul.authid | html %]" href="/cgi-bin/koha/authorities/detail.pl?authid=[% resul.authid | uri %]"><i class="fa-solid fa-eye"></i> MARC preview</a> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35871
:
161263
|
161318
|
161319
|
177209
|
177495