Attachment 173400 Details for Bug 38040 – Bug 38040: Disabled tables element for staff

[patch] Bug 38040: Disabled tables element for staff

Bug-38040-Disabled-tables-element-for-staff.patch (text/plain), 4.80 KB, created by Sukhmandeep on 2024-10-25 16:38:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sukhmandeep

Created: 2024-10-25 16:38:30 UTC

Size: 4.80 KB

patch

obsolete

>From 6b12c3af003ae30e06216382bb249faa539eb30f Mon Sep 17 00:00:00 2001
>From: Sukhmandeep Benipal <sukhmandeep.benipal@inLibro.com>
>Date: Fri, 25 Oct 2024 12:30:51 -0400
>Subject: [PATCH] Bug 38040: Disabled tables element for staff
>
>The test plan is the same has mentioned before:
>1. Set IndependentBranches, IndependentBranchesPatronModifications, and IndependentBranchesTransfers to 'Yes'
>
>2. Set canreservefromotherbranches to "Don't allow (with independent branches)"
>
>3. Give limited permissions to a staff patron
>   - circulate
>   - catalogue
>   - delete_borrowers
>   - edit_borrowers
>   - list_borrowers
>   - send_messages_to_borrowers
>   - reserveforothers
>   - updatecharges
>
>4. As the superlibrarian, place several holds on a record with items from various branches
>
>5. Log in as the restricted staff
>
>6. View the holds for the record
>   --> Some will say "A patron from library XX" instead of the name -- OK
>
>7. Click the trash bin icon to cancel a hold from another library
>   --> Hold is cancelled -- NOT OK
>8. Apply the patch and validate that step 7 is not possible now.
>---
> .../prog/en/modules/reserve/request.tt        | 22 +++++++++++++++++++
> reserve/request.pl                            | 17 ++++++++++----
> 2 files changed, 35 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 2141e06c51..60c830bdab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -102,6 +102,12 @@
>         :disabled{
>             opacity:0.5
>         }
>+
>+        .disabled_trash{       
>+            pointer-events: none;       
>+            cursor: not-allowed ;
>+            color: #777;  
>+        }
>     </style>
> [% END %]
> </head>
>@@ -1859,6 +1865,22 @@
>                 return false;
>             });
> 
>+            [% IF (!is_super_librarian) %]  
>+                var user_branch = "[% user_branch %]";
>+                if(user_branch !== undefined && user_branch !== ""){
>+                    $('#patron_holds_table tbody tr').each(function() {
>+                        var link = $(this).find('a[href*="member"]');
>+                        var rankRequest = $(this).find("select[name='rank-request']");
>+                        if (!link.length){
>+                           $(this).find('.cancel-hold, .fa-trash').addClass('disabled_trash');
>+                        }
>+                        $(this).find('.select_hold, .rank-request, td a[data-op="cud-move"], .flatpickr, .toggle-suspend, .clear_date, [name*="change_hold_type_"]').addClass('disabled').attr('disabled', 'disabled');
>+                        $('.select_hold_all, .hold-arrow').addClass('disabled').attr('disabled', 'disabled');
>+                        $('.suspend-hold').prop('disabled', true);
>+                    });
>+               }
>+            [% END %]
>+
>             [% UNLESS ( patron || patron.borrowernumber || borrowers || noitems || nobiblio ) %]
>                 [% IF ( PatronAutoComplete ) %]
>                     patron_autocomplete($(".search_patron_filter"), { 'link-to': 'reserve', 'url-params': '[% url_biblio_params | url %]' });
>diff --git a/reserve/request.pl b/reserve/request.pl
>index b19fa3b868..a869307806 100755
>--- a/reserve/request.pl
>+++ b/reserve/request.pl
>@@ -40,6 +40,7 @@ use C4::Serials qw( CountSubscriptionFromBiblionumber );
> use C4::Circulation qw( _GetCircControlBranch GetBranchItemRule );
> use Koha::DateUtils qw( dt_from_string );
> use C4::Search qw( enabled_staff_search_views );
>+use C4::Context;
> 
> use Koha::Biblios;
> use Koha::Checkouts;
>@@ -64,6 +65,14 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
>     }
> );
> 
>+my $is_super_librarian = C4::Context->IsSuperLibrarian();
>+my $user_branch = C4::Context->preference("IndependentBranches") ? C4::Context->userenv->{'branch'}: undef;
>+
>+$template->param(
>+    is_super_librarian => $is_super_librarian,
>+    user_branch => $user_branch,
>+);
>+
> my $showallitems = $input->param('showallitems');
> my $pickup = $input->param('pickup');
> 
>@@ -111,10 +120,10 @@ if ( $op eq 'cud-move' ) {
>     }
> }
> elsif ( $op eq 'cud-cancel' ) {
>-    my $reserve_id          = $input->param('reserve_id');
>-    my $cancellation_reason = $input->param("cancellation-reason");
>-    my $hold                = Koha::Holds->find($reserve_id);
>-    $hold->cancel( { cancellation_reason => $cancellation_reason } ) if $hold;
>+        my $reserve_id          = $input->param('reserve_id');
>+        my $cancellation_reason = $input->param("cancellation-reason");
>+        my $hold                = Koha::Holds->find($reserve_id);
>+        $hold->cancel( { cancellation_reason => $cancellation_reason } ) if $hold;
> }
> elsif ( $op eq 'cud-setLowestPriority' ) {
>     my $reserve_id = $input->param('reserve_id');
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 38040: 173400