@@ -, +, @@ no permissions for --- cataloguing/additem.pl | 10 ++++++---- tools/batchMod.pl | 5 ++++- 2 files changed, 10 insertions(+), 5 deletions(-) --- a/cataloguing/additem.pl +++ a/cataloguing/additem.pl @@ -105,8 +105,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; @@ -192,7 +192,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; @@ -974,7 +976,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++; @@ -998,7 +1000,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++; } --- a/tools/batchMod.pl +++ a/tools/batchMod.pl @@ -39,7 +39,7 @@ use C4::Koha; use C4::BackgroundJob; use C4::ClassSource qw( GetClassSources GetClassSource ); use MARC::File::XML; -use List::MoreUtils qw( uniq ); +use List::MoreUtils qw( uniq any ); use Koha::Database; use Koha::Exceptions::Exception; @@ -419,6 +419,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}}) { @@ -462,6 +464,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}; } --