Attachment 124343 Details for Bug 24857 – Bug 24857: Add user permission for volumes management

[patch] Bug 24857: Add user permission for volumes management

Bug-24857-Add-user-permission-for-volumes-manageme.patch (text/plain), 9.08 KB, created by Tomás Cohen Arazi (tcohen) on 2021-09-01 13:16:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2021-09-01 13:16:55 UTC

Size: 9.08 KB

patch

obsolete

>From d35aa4df78a1933db423438dcc70b0cec893d3ea Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 15 May 2020 15:13:26 -0400
>Subject: [PATCH] Bug 24857: Add user permission for volumes management
>
>Signed-off-by: Rebecca  Coert <rcoert@arlingtonva.us>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> api/v1/swagger/paths/biblios_volumes.json     | 14 +++++-----
> .../data/mysql/atomicupdate/volumes.perl      |  5 ++++
> .../data/mysql/mandatory/userpermissions.sql  |  1 +
> .../prog/en/includes/permissions.inc          |  5 ++++
> .../prog/en/modules/catalogue/detail.tt       | 28 +++++++++++--------
> .../prog/en/modules/cataloguing/additem.tt    |  2 +-
> 6 files changed, 36 insertions(+), 19 deletions(-)
>
>diff --git a/api/v1/swagger/paths/biblios_volumes.json b/api/v1/swagger/paths/biblios_volumes.json
>index 2d2ef7a69e..d5dec3cb08 100644
>--- a/api/v1/swagger/paths/biblios_volumes.json
>+++ b/api/v1/swagger/paths/biblios_volumes.json
>@@ -70,7 +70,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             },
>             "x-koha-embed": [
>@@ -169,7 +169,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             }
>         }
>@@ -240,7 +240,7 @@
>             ],
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             }
>         },
>@@ -337,7 +337,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             },
>             "x-koha-embed": [
>@@ -409,7 +409,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             }
>         }
>@@ -501,7 +501,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             },
>             "x-koha-embed": [
>@@ -585,7 +585,7 @@
>             },
>             "x-koha-authorization": {
>                 "permissions": {
>-                    "catalogue": "1"
>+                    "catalogue": "CAN_user_editcatalogue_manage_volumes"
>                 }
>             }
>         }
>diff --git a/installer/data/mysql/atomicupdate/volumes.perl b/installer/data/mysql/atomicupdate/volumes.perl
>index 7f60669fe8..c1886b3087 100644
>--- a/installer/data/mysql/atomicupdate/volumes.perl
>+++ b/installer/data/mysql/atomicupdate/volumes.perl
>@@ -5,6 +5,11 @@ if ( CheckVersion( $DBversion ) ) {
>         ('EnableVolumes','0','','Enable volumes feature','YesNo');
>     });
> 
>+    $dbh->do(q{
>+        INSERT INTO permissions (module_bit, code, description) VALUES
>+        ( 9, 'manage_volumes', 'Create, update and delete volumes, add or remove items from a volume');
>+    });
>+
>     unless ( TableExists('volumes') ) {
>         $dbh->do(q{
>             CREATE TABLE `volumes` ( -- information related to bibliographic records in Koha
>diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql
>index f1c2d8883b..b82c4f48bc 100644
>--- a/installer/data/mysql/mandatory/userpermissions.sql
>+++ b/installer/data/mysql/mandatory/userpermissions.sql
>@@ -49,6 +49,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
>    ( 9, 'edit_items', 'Edit items'),
>    ( 9, 'edit_items_restricted', 'Limit item modification to subfields defined in the SubfieldsToAllowForRestrictedEditing preference (please note that edit_item is still required)'),
>    ( 9, 'delete_all_items', 'Delete all items at once'),
>+   ( 9, 'manage_volumes', 'Create, update and delete volumes, add or remove items from a volume'),
>    (10, 'payout', 'Perform account payout action'),
>    (10, 'refund', 'Perform account refund action'),
>    (10, 'discount', 'Perform account discount action'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>index cc253be52e..8e0b18383c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
>@@ -330,6 +330,11 @@
>             Fast cataloging
>         </span>
>         <span class="permissioncode">([% name | html %])</span>
>+    [%- CASE 'manage_volumes' -%]
>+        <span class="sub_permission manage_volumes_subpermission">
>+            Create, update and delete volumes, add or remove items from a volume
>+        </span>
>+        <span class="permissioncode">([% name | html %])</span>
>     [%- CASE 'remaining_permissions' -%]
>         <span class="sub_permission remaining_permissions_subpermission">
>             Remaining permissions for managing fines and fees
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index ca3777524c..a258896661 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -310,7 +310,7 @@
>               [% IF CAN_user_tools_items_batchmod %]
>                 <a class="itemselection_action_modify"><i class="fa fa-pencil"></i> Modify selected items</a>
>               [% END %]
>-              [% IF biblio.volumes.count %]
>+              [% IF CAN_user_editcatalogue_manage_volumes && biblio.volumes.count %]
>                 <a class="itemselection_action_volume_set" href="#"><i class="fa fa-book"></i> Add/move to volume</a>
>                 <a class="itemselection_action_volume_unset" href="#"><i class="fa fa-unlink"></i> Remove from volume</a>
>               [% END %]
>@@ -611,9 +611,11 @@ Note that permanent location is a code, and location may be an authval.
> 
> [% IF Koha.Preference('EnableVolumes') %]
>     <div id="volumes">
>-        <div class="volumes_table_table_controls">
>-            <a href="#" class="volume-create btn btn-default btn-xs"><i class="fa fa-plus"></i> Create new</a>
>-        </div>
>+        [% IF CAN_user_editcatalogue_manage_volumes %]
>+            <div class="volumes_table_table_controls">
>+                <a href="#" class="volume-create btn btn-default btn-xs"><i class="fa fa-plus"></i> Create new</a>
>+            </div>
>+        [% END %]
>         <table class="volumes-table" id="volumes-table">
>             <thead>
>                 <tr>
>@@ -1541,13 +1543,17 @@ Note that permanent location is a code, and location may be an authval.
>                     },
>                     {
>                         "mDataProp": function( oObj ) {
>-                            return `<button class='volume-edit btn btn-default btn-xs' data-volume-id='${oObj.volume_id}'>
>-                                <i class='fa fa-edit'></i> ${_('Edit')}
>-                            </button>`
>-                            + '&nbsp'
>-                            + `<button class='volume-delete btn btn-default btn-xs' data-volume-id='${oObj.volume_id}'>
>-                                <i class='fa fa-trash'></i> ${('Delete')}
>-                            </button>`;
>+                            [% IF CAN_user_editcatalogue_manage_volumes %]
>+                                return `<button class='volume-edit btn btn-default btn-xs' data-volume-id='${oObj.volume_id}'>
>+                                    <i class='fa fa-edit'></i> ${_('Edit')}
>+                                </button>`
>+                                + '&nbsp'
>+                                + `<button class='volume-delete btn btn-default btn-xs' data-volume-id='${oObj.volume_id}'>
>+                                    <i class='fa fa-trash'></i> ${('Delete')}
>+                                </button>`;
>+                            [% ELSE %]
>+                                return "";
>+                            [% END %]
>                         },
>                     },
>                 ],
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>index d18dcdde29..28fea30993 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -241,7 +241,7 @@
>     <input type="hidden" name="indicator" value=" " />
>     <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
> 
>-[% IF volumes.count && op != 'saveitem' %]
>+[% IF volumes.count && op != 'saveitem' && CAN_user_editcatalogue_manage_volumes %]
>     <fieldset class="rows">
>         <legend><i class="fa fa-plus"></i> Add to volume</legend>
>         [% FOREACH v IN volumes %]
>-- 
>2.33.0

Actions: View | Diff | Splinter Review

Attachments on bug 24857: 100652 | 100653 | 100654 | 100655 | 100656 | 100657 | 100658 | 100659 | 100660 | 100661 | 100662 | 101637 | 101638 | 101639 | 101640 | 101641 | 101642 | 101643 | 101644 | 101645 | 101646 | 101647 | 101648 | 101650 | 101651 | 101652 | 101653 | 101654 | 101655 | 101656 | 101657 | 101658 | 101659 | 101660 | 101661 | 101670 | 101671 | 101672 | 101673 | 101674 | 101675 | 101676 | 101677 | 101678 | 101679 | 101680 | 101681 | 101730 | 101731 | 101732 | 101733 | 101734 | 101735 | 101736 | 101737 | 101738 | 101739 | 101740 | 101741 | 101752 | 101753 | 101754 | 101755 | 101756 | 101757 | 101758 | 101759 | 101760 | 101761 | 101762 | 101763 | 104952 | 104953 | 104954 | 104955 | 104956 | 104957 | 104958 | 104959 | 104960 | 104961 | 104962 | 104963 | 104964 | 104966 | 106728 | 106729 | 106730 | 106731 | 106732 | 106733 | 106734 | 106735 | 106736 | 106737 | 106738 | 106739 | 106740 | 106741 | 108443 | 108444 | 108445 | 108446 | 108447 | 108448 | 108449 | 108450 | 108451 | 108452 | 108453 | 108454 | 108455 | 108456 | 108666 | 108667 | 108668 | 108669 | 108670 | 108671 | 108672 | 108673 | 108674 | 108675 | 108676 | 108677 | 108678 | 108679 | 108680 | 108681 | 108682 | 108683 | 108684 | 108685 | 108686 | 109074 | 109075 | 109076 | 109077 | 109078 | 109079 | 109080 | 109081 | 109082 | 109083 | 109084 | 109085 | 109086 | 109087 | 109088 | 109089 | 109090 | 109091 | 109092 | 109093 | 109094 | 109795 | 109796 | 109797 | 109798 | 109799 | 109800 | 109801 | 109802 | 109803 | 109804 | 109805 | 109806 | 109807 | 109808 | 109809 | 109810 | 109811 | 109812 | 109813 | 109814 | 109815 | 109894 | 109901 | 109902 | 109903 | 109904 | 109905 | 109906 | 109907 | 109908 | 109909 | 109910 | 109911 | 109912 | 109913 | 109914 | 109915 | 109916 | 109917 | 109918 | 109919 | 109920 | 109921 | 109922 | 109923 | 113136 | 113137 | 113138 | 113139 | 113140 | 113141 | 113142 | 113143 | 113144 | 113145 | 113146 | 113147 | 113148 | 113149 | 113150 | 113151 | 113152 | 113153 | 113154 | 113155 | 113156 | 113157 | 113158 | 113159 | 113160 | 113168 | 113169 | 113170 | 113171 | 113172 | 113173 | 113174 | 113175 | 113176 | 113177 | 113178 | 113179 | 113180 | 113181 | 113182 | 113183 | 113184 | 113185 | 113186 | 113187 | 113188 | 113189 | 113190 | 113191 | 120495 | 120496 | 120497 | 120498 | 120499 | 120500 | 120501 | 120502 | 120503 | 120504 | 120505 | 120506 | 120507 | 120508 | 120509 | 120510 | 120511 | 120512 | 120513 | 120514 | 120515 | 120516 | 120517 | 120518 | 122808 | 122809 | 122810 | 122811 | 122812 | 122813 | 122814 | 122815 | 122816 | 122817 | 122818 | 122819 | 122820 | 122821 | 122822 | 122823 | 122824 | 122825 | 122826 | 122827 | 122828 | 122829 | 122830 | 122831 | 123882 | 123883 | 123884 | 123885 | 123886 | 123887 | 123888 | 123889 | 123890 | 123891 | 123892 | 123893 | 123894 | 123895 | 123896 | 123897 | 123898 | 123899 | 123900 | 123901 | 123902 | 123903 | 123904 | 123905 | 123906 | 123907 | 123908 | 123909 | 123910 | 123912 | 124021 | 124022 | 124023 | 124024 | 124025 | 124026 | 124027 | 124028 | 124029 | 124030 | 124031 | 124032 | 124033 | 124034 | 124035 | 124036 | 124037 | 124038 | 124039 | 124040 | 124041 | 124042 | 124043 | 124044 | 124045 | 124046 | 124047 | 124048 | 124049 | 124050 | 124051 | 124052 | 124053 | 124331 | 124332 | 124333 | 124334 | 124335 | 124336 | 124337 | 124338 | 124339 | 124340 | 124341 | 124342 | 124343 | 124344 | 124345 | 124346 | 124347 | 124348 | 124349 | 124351 | 124352 | 124353 | 124354 | 124355 | 124356 | 124357 | 124358 | 124359 | 124360 | 124361 | 124362 | 124363 | 124421 | 124463 | 124583 | 124584 | 124585 | 124586 | 124587 | 124588 | 124589 | 124590 | 124591 | 124592 | 124593 | 124594 | 124595 | 124596 | 124597 | 124598 | 124599 | 124600 | 124601 | 124602 | 124603 | 124604 | 124605 | 124606 | 124607 | 124608 | 124609 | 124610 | 124611 | 124612 | 124613 | 124614 | 124615 | 131449 | 131450 | 131451 | 131452 | 131453 | 131454 | 131455 | 131456 | 134288 | 134289 | 134290 | 134291 | 134292 | 134293 | 134294 | 134295 | 134296 | 135590 | 135591 | 135592 | 135593 | 135594 | 135595 | 135596 | 135597 | 135598 | 135599 | 135600 | 135601 | 135602 | 135603 | 135604 | 135605 | 135606 | 135607 | 135608 | 135609 | 135610 | 135614 | 135615 | 135616 | 135617 | 135618 | 135619 | 135620 | 135621 | 135622 | 135623 | 135624 | 135625 | 135626 | 135627 | 135628 | 135629 | 137259 | 137260 | 137261 | 137262 | 137263 | 137264 | 137265 | 137266 | 137267 | 137268 | 137311 | 137314 | 137315 | 137316 | 137317 | 137318 | 137319 | 137320 | 137321 | 137322 | 137323 | 137441 | 137442 | 137443 | 137608 | 138933