Attachment 108868 Details for Bug 20256 – Bug 20256: (QA follow-up) Filter out branchcodes the user has no permissions for

[patch] Bug 20256: (QA follow-up) Filter out branchcodes the user has no permissions for

Bug-20256-QA-follow-up-Filter-out-branchcodes-the-.patch (text/plain), 4.14 KB, created by Kyle M Hall (khall) on 2020-08-21 18:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2020-08-21 18:20:58 UTC

Size: 4.14 KB

patch

obsolete

>From 625ceab5a6a2938d283aea21f6efe6490d46c531 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 5 Dec 2019 06:32:25 -0500
>Subject: [PATCH] Bug 20256: (QA follow-up) Filter out branchcodes the user has
> no permissions for
>
>Signed-off-by: Bob Bennhoff - CLiC <bbennhoff@clicweb.org>
>---
> cataloguing/additem.pl | 10 ++++++----
> tools/batchMod.pl      |  5 ++++-
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index e8cf90dfde..d5685062a1 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -107,8 +107,8 @@ sub _increment_barcode {
> 
> 
> sub generate_subfield_form {
>-        my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition, $item) = @_;
>-  
>+        my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition, $item, $patron) = @_;
>+
>         my $frameworkcode = &GetFrameworkCode($biblionumber);
> 
>         my %subfield_data;
>@@ -187,7 +187,9 @@ sub generate_subfield_form {
>                 }
>             }
>             elsif ( $subfieldlib->{authorised_value} eq "branches" ) {
>+                my @allowed = $patron->libraries_where_can_edit_items;
>                 foreach my $thisbranch (@$branches) {
>+                    next unless any { /^$thisbranch->{branchcode}$/ } @allowed;
>                     push @authorised_values, $thisbranch->{branchcode};
>                     $authorised_lib{$thisbranch->{branchcode}} = $thisbranch->{branchname};
>                     $value = $thisbranch->{branchcode} if $thisbranch->{selected} && !$value;
>@@ -951,7 +953,7 @@ if($itemrecord){
> 
>             next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
> 
>-            my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item);
>+            my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item, $patron);
>             push @fields, "$tag$subfieldtag";
>             push (@loop_data, $subfield_data);
>             $i++;
>@@ -975,7 +977,7 @@ foreach my $tag ( keys %{$tagslib}){
>         my @values = (undef);
>         @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
>         for my $value (@values){
>-            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item);
>+            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $libraries, $biblionumber, $temp, \@loop_data, $i, $restrictededition, $item, $patron);
>             push (@loop_data, $subfield_data);
>             $i++;
>         }
>diff --git a/tools/batchMod.pl b/tools/batchMod.pl
>index 8e90e6bfc5..271faf954a 100755
>--- a/tools/batchMod.pl
>+++ b/tools/batchMod.pl
>@@ -34,7 +34,7 @@ use C4::ClassSource;
> use C4::Debug;
> use C4::Members;
> use MARC::File::XML;
>-use List::MoreUtils qw/uniq/;
>+use List::MoreUtils qw( uniq any );
> 
> use Koha::Database;
> use Koha::Exceptions::Exception;
>@@ -412,6 +412,8 @@ my $allowAllSubfields = (
> ) ? 1 : 0;
> my @subfieldsToAllow = split(/ /, $subfieldsToAllowForBatchmod);
> 
>+my @allowed_to_edit_branches = $patron->libraries_where_can_edit_items;
>+
> foreach my $tag (sort keys %{$tagslib}) {
>     # loop through each subfield
>     foreach my $subfield (sort keys %{$tagslib->{$tag}}) {
>@@ -456,6 +458,7 @@ foreach my $tag (sort keys %{$tagslib}) {
> 
>     if ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "branches" ) {
>         foreach my $library (@$libraries) {
>+            next unless any { /^$library->{branchcode}$/ } @allowed_to_edit_branches;
>             push @authorised_values, $library->{branchcode};
>             $authorised_lib{$library->{branchcode}} = $library->{branchname};
>         }
>-- 
>2.24.1 (Apple Git-126)

Actions: View | Diff | Splinter Review

Attachments on bug 20256: 87226 | 87227 | 87228 | 87229 | 87230 | 87231 | 87232 | 87233 | 87262 | 87263 | 87264 | 87265 | 87266 | 87267 | 87268 | 87269 | 87270 | 88537 | 88539 | 88541 | 88542 | 88543 | 88544 | 88545 | 88546 | 88547 | 88632 | 88702 | 88703 | 88704 | 88705 | 88935 | 88936 | 96015 | 96016 | 96017 | 96018 | 96019 | 96020 | 96021 | 96022 | 96023 | 96024 | 96025 | 96026 | 96027 | 96028 | 96029 | 96030 | 96031 | 96032 | 96033 | 102622 | 102623 | 102624 | 102625 | 102626 | 102627 | 102628 | 102629 | 102630 | 102631 | 102632 | 102633 | 102634 | 102635 | 102636 | 102637 | 102638 | 102639 | 102640 | 102641 | 102642 | 102703 | 102704 | 102705 | 102706 | 102707 | 102708 | 102709 | 102710 | 102711 | 102712 | 102713 | 102714 | 102715 | 102716 | 102717 | 102718 | 102719 | 102720 | 102721 | 102722 | 102732 | 102733 | 102734 | 102735 | 102736 | 102737 | 102738 | 102739 | 102740 | 102741 | 102742 | 102743 | 102744 | 102745 | 102746 | 102747 | 102748 | 102749 | 102750 | 102751 | 107312 | 107313 | 107314 | 107315 | 107316 | 107317 | 107318 | 107319 | 107320 | 107321 | 107322 | 107323 | 107324 | 107325 | 107326 | 107327 | 107328 | 107329 | 107330 | 108851 | 108852 | 108853 | 108854 | 108855 | 108856 | 108857 | 108858 | 108859 | 108860 | 108861 | 108862 | 108863 | 108864 | 108865 | 108866 | 108867 | 108868 | 108869 | 108870 | 109939 | 110005 | 113706 | 113707 | 113708 | 113709 | 113710 | 113711 | 113712 | 113713 | 113714 | 113715 | 113716 | 113717 | 113718 | 113719 | 113720 | 113721 | 113722 | 113723 | 113724 | 113725 | 113726 | 113727 | 113728 | 116042 | 116043 | 116044 | 116045 | 116046 | 116047 | 116048 | 116049 | 116050 | 116051 | 116052 | 116053 | 116054 | 116055 | 116056 | 116057 | 116058 | 116059 | 116060 | 116061 | 116062 | 116063 | 116064 | 120055 | 120056 | 120057 | 120058 | 120059 | 120060 | 120061 | 120062 | 120063 | 120064 | 120065 | 120066 | 120067 | 120068 | 120069 | 120070 | 120071 | 120072 | 120073 | 120074 | 120075 | 120076 | 121771 | 121772 | 121773 | 121774 | 121775 | 121776 | 121777 | 121778 | 121779 | 121780 | 121781 | 121782 | 121783 | 121785 | 121786 | 121787 | 121788 | 121789 | 121790 | 121791 | 121792 | 124286 | 124287 | 124288 | 124289 | 124290 | 124291 | 124292 | 124293 | 124294 | 124295 | 124296 | 124297 | 124298 | 124299 | 124300 | 124301 | 124302 | 124303 | 124304 | 124305 | 124306 | 124307 | 124321 | 128734 | 128735 | 128736 | 128737 | 128738 | 128739 | 128740 | 128741 | 128742 | 128743 | 128744 | 128745 | 128746 | 128747 | 128748 | 128749 | 128750 | 128751 | 128752 | 128753 | 131676 | 131677 | 131678 | 131679 | 131680 | 131681 | 131682 | 131683 | 131684 | 131685 | 131686 | 131687 | 131688 | 131689 | 131690 | 131691 | 131692 | 131693 | 131694 | 131695 | 131696 | 131697 | 132483 | 132484 | 132486 | 132917 | 134375 | 134376 | 134377 | 139135 | 139136 | 139137 | 139138 | 139139 | 139140 | 139141 | 139142 | 139143 | 139144 | 139145 | 139146 | 139147 | 139148 | 139149 | 139150 | 139151 | 139152 | 139153 | 139154 | 139155 | 139156 | 139157 | 139158 | 139159 | 139160 | 139161 | 139162 | 139163 | 143527 | 143529 | 143530 | 143531 | 143532 | 143533 | 143534 | 143535 | 143536 | 143537 | 143538 | 143539 | 143540 | 143541 | 143542 | 143543 | 143544 | 143545 | 143546 | 143547 | 143548 | 143549 | 143550 | 143551 | 143552 | 143553 | 143554 | 143555 | 143556 | 145286 | 145287 | 145288 | 145289 | 145290 | 145291 | 145292 | 145293 | 145482 | 145483 | 145484 | 145485 | 145486 | 145487 | 145488 | 145489 | 145809 | 145810 | 145811 | 145812 | 145813 | 145814 | 145815 | 145816 | 145887 | 145888 | 145889 | 145890 | 145891 | 145892 | 145893 | 145894 | 145895 | 145896 | 145951 | 145952 | 145953 | 145954 | 145955