Attachment 88546 Details for Bug 20256 – Bug 20256: Use new methods

[patch] Bug 20256: Use new methods

Bug-20256-Use-new-methods.patch (text/plain), 7.29 KB, created by Kyle M Hall (khall) on 2019-04-23 16:41:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2019-04-23 16:41:07 UTC

Size: 7.29 KB

patch

obsolete

>From d78bbd52c8c6d7ea38eca5fe10beb616b82672eb Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 28 Mar 2019 11:07:02 -0400
>Subject: [PATCH] Bug 20256: Use new methods
>
>Signed-off-by: Bob Bennhoff - CLiC <bbennhoff@clicweb.org>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/Items.pm                                   |  4 +---
> catalogue/detail.pl                           |  8 +-------
> catalogue/moredetail.pl                       |  9 ++-------
> cataloguing/additem.pl                        | 13 +++++++++----
> .../prog/en/modules/catalogue/detail.tt       |  4 +++-
> tools/batchMod.pl                             | 19 ++++++++-----------
> 6 files changed, 24 insertions(+), 33 deletions(-)
>
>diff --git a/C4/Items.pm b/C4/Items.pm
>index 14fcdcfc37..19568d93fb 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -1746,9 +1746,7 @@ sub ItemSafeToDelete {
>         $status = "book_on_loan";
>     }
>     elsif ( defined C4::Context->userenv
>-        and !C4::Context->IsSuperLibrarian()
>-        and C4::Context->preference("IndependentBranches")
>-        and ( C4::Context->userenv->{branch} ne $item->homebranch ) )
>+         and !Koha::Patrons->find( C4::Context->userenv->{number} )->can_edit_item( $item ) )
>     {
>         $status = "not_same_branch";
>     }
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 9cd6b523bd..318f464a07 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -340,13 +340,7 @@ foreach my $item (@items) {
>         $item->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $item->{'itemnumber'} );
>     }
> 
>-    if ( C4::Context->preference('IndependentBranches') ) {
>-        my $userenv = C4::Context->userenv();
>-        if ( not C4::Context->IsSuperLibrarian()
>-            and $userenv->{branch} ne $item->{homebranch} ) {
>-            $item->{cannot_be_edited} = 1;
>-        }
>-    }
>+    $item->{cannot_be_edited} = !$patron->can_edit_item( $item_object );
> 
>     if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
>     and C4::Context->preference('SeparateHoldings')) {
>diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
>index e8736ff398..5984f50a1d 100755
>--- a/catalogue/moredetail.pl
>+++ b/catalogue/moredetail.pl
>@@ -174,13 +174,8 @@ foreach my $item (@items){
>         $item->{status_advisory} = 1;
>     }
> 
>-    if (C4::Context->preference("IndependentBranches")) {
>-        #verifying rights
>-        my $userenv = C4::Context->userenv();
>-        unless (C4::Context->IsSuperLibrarian() or ($userenv->{'branch'} eq $item->{'homebranch'})) {
>-                $item->{'nomod'}=1;
>-        }
>-    }
>+    $item->{nomod} = !$patron->can_edit_item( $item );
>+
>     if ($item->{'datedue'}) {
>         $item->{'issue'}= 1;
>     } else {
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index 48417aac5d..c70d028c42 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -412,7 +412,8 @@ my ($template, $loggedinuser, $cookie)
> 
> 
> # Does the user have a restricted item editing permission?
>-my $uid = Koha::Patrons->find( $loggedinuser )->userid;
>+my $patron = Koha::Patrons->find( $loggedinuser );
>+my $uid = $patron->userid;
> my $restrictededition = $uid ? haspermission($uid,  {'editcatalogue' => 'edit_items_restricted'}) : undef;
> # In case user is a superlibrarian, editing is not restricted
> $restrictededition = 0 if ($restrictededition != 0 &&  C4::Context->IsSuperLibrarian());
>@@ -802,13 +803,17 @@ foreach my $field (@fields) {
> 						|| $subfieldvalue;
>         }
> 
>-        if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependentBranches")) {
>+        if (   $subfieldvalue
>+            && ( $field->tag eq $branchtagfield )
>+            && ( $subfieldcode eq $branchtagsubfield ) )
>+        {
>             #verifying rights
>-            my $userenv = C4::Context->userenv();
>-            unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $subfieldvalue))){
>+            unless ( $patron->can_edit_item($subfieldvalue) ) {
>+                warn "NOMOD";
>                 $this_row{'nomod'} = 1;
>             }
>         }
>+
>         $this_row{itemnumber} = $subfieldvalue if ($field->tag() eq $itemtagfield && $subfieldcode eq $itemtagsubfield);
> 
>         if ( C4::Context->preference('EasyAnalyticalRecords') ) {
>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 0ffe432965..3e54622098 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -222,7 +222,9 @@
>                 <tr>
>                 [% IF (StaffDetailItemSelection) %]
>                     <td style="text-align:center;vertical-align:middle">
>-                        <input type="checkbox" value="[% item.itemnumber | html %]" name="itemnumber" />
>+                        [% UNLESS item.cannot_be_edited %]
>+                            <input type="checkbox" value="[% item.itemnumber | html %]" name="itemnumber" />
>+                        [% END %]
>                     </td>
>                 [% END %]
>                     [% IF ( item_level_itypes ) %]
>diff --git a/tools/batchMod.pl b/tools/batchMod.pl
>index e5b6032900..f9272ef8a0 100755
>--- a/tools/batchMod.pl
>+++ b/tools/batchMod.pl
>@@ -75,7 +75,8 @@ my ($template, $loggedinuser, $cookie)
>                  });
> 
> # Does the user have a restricted item edition permission?
>-my $uid = $loggedinuser ? Koha::Patrons->find( $loggedinuser )->userid : undef;
>+my $patron = Koha::Patrons->find( $loggedinuser );
>+my $uid = $loggedinuser ? $patron->userid : undef;
> my $restrictededition = $uid ? haspermission($uid,  {'tools' => 'items_batchmod_restricted'}) : undef;
> # In case user is a superlibrarian, edition is not restricted
> $restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibrarian());
>@@ -539,21 +540,17 @@ sub BuildItemsData{
> 		my (  $itemtagfield,   $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", "");
> 		my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", "");
> 		foreach my $itemnumber (@itemnumbers){
>-            my $itemdata = Koha::Items->find($itemnumber);
>-            next unless $itemdata; # Should have been tested earlier, but just in case...
>-            $itemdata = $itemdata->unblessed;
>+            my $item = Koha::Items->find($itemnumber);
>+            next unless $item; # Should have been tested earlier, but just in case...
>+            my $itemdata = $item->unblessed;
> 			my $itemmarc=Item2Marc($itemdata);
> 			my %this_row;
> 			foreach my $field (grep {$_->tag() eq $itemtagfield} $itemmarc->fields()) {
> 				# loop through each subfield
> 				my $itembranchcode=$field->subfield($branchtagsubfield);
>-                if ($itembranchcode && C4::Context->preference("IndependentBranches")) {
>-						#verifying rights
>-						my $userenv = C4::Context->userenv();
>-                        unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $itembranchcode))){
>-								$this_row{'nomod'}=1;
>-						}
>-				}
>+                if ($itembranchcode) {
>+                    $this_row{'nomod'} = !$patron->can_edit_item($item);
>+                }
> 				my $tag=$field->tag();
> 				foreach my $subfield ($field->subfields) {
> 					my ($subfcode,$subfvalue)=@$subfield;
>-- 
>2.20.1 (Apple Git-117)

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