Attachment 111786 Details for Bug 24786 – Bug 24786: (QA follow-up) Fix Registers Plugin

[patch] Bug 24786: (QA follow-up) Fix Registers Plugin

Bug-24786-QA-follow-up-Fix-Registers-Plugin.patch (text/plain), 1.50 KB, created by Katrin Fischer on 2020-10-15 17:37:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-15 17:37:25 UTC

Size: 1.50 KB

patch

obsolete

>From 63ebc493a19662eaa52fa79838dcaac72cc855b9 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 14 Oct 2020 13:42:32 +0100
>Subject: [PATCH] Bug 24786: (QA follow-up) Fix Registers Plugin
>
>For the QA script we do not set a userenv, so we result in a failure due
>to a lack of checking for userenv prior to using it.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> Koha/Template/Plugin/Registers.pm | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Template/Plugin/Registers.pm b/Koha/Template/Plugin/Registers.pm
>index 313a2b11eb..05e0579544 100644
>--- a/Koha/Template/Plugin/Registers.pm
>+++ b/Koha/Template/Plugin/Registers.pm
>@@ -84,14 +84,15 @@ Returns a list of all cash registers available that adhere to the passed filters
> sub all {
>     my ( $self, $params ) = @_;
> 
>-    my $filters = $params->{filters};
>+    my $filters = $params->{filters} // {};
>     my $where;
>-    $where->{branch} = C4::Context->userenv->{'branch'}
>+    $where->{branch} =
>+      C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef
>       if $filters->{current_branch};
>     my $registers = Koha::Cash::Registers->search($where)->unblessed();
>     for my $register ( @{$registers} ) {
>         $register->{selected} = ( defined( $self->session_register_id )
>-              && $register->{id} == $self->session_register_id ) ? 1 : 0;
>+              && $register->{id} eq $self->session_register_id ) ? 1 : 0;
>     }
> 
>     return $registers;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24786: 107145 | 107146 | 107147 | 107148 | 107149 | 107739 | 107740 | 107741 | 107742 | 107743 | 107754 | 107755 | 107756 | 107757 | 107758 | 107759 | 107957 | 107958 | 107959 | 107960 | 107961 | 107962 | 108060 | 108061 | 108062 | 108063 | 108064 | 108065 | 108066 | 108510 | 108511 | 108512 | 108513 | 108514 | 108515 | 108516 | 110162 | 110163 | 110164 | 110165 | 110166 | 110167 | 110168 | 110187 | 110188 | 110189 | 110190 | 110191 | 110192 | 110193 | 111066 | 111067 | 111068 | 111069 | 111070 | 111071 | 111072 | 111074 | 111126 | 111127 | 111128 | 111129 | 111130 | 111131 | 111132 | 111133 | 111220 | 111221 | 111222 | 111223 | 111224 | 111225 | 111226 | 111227 | 111228 | 111229 | 111230 | 111231 | 111232 | 111233 | 111234 | 111235 | 111611 | 111612 | 111613 | 111614 | 111615 | 111616 | 111617 | 111618 | 111619 | 111620 | 111623 | 111725 | 111757 | 111758 | 111759 | 111760 | 111761 | 111762 | 111763 | 111764 | 111765 | 111766 | 111767 | 111768 | 111769 | 111770 | 111776 | 111777 | 111778 | 111779 | 111780 | 111781 | 111782 | 111783 | 111784 | 111785 | 111786 | 111787 | 111788 | 112985 | 112988 | 112989 | 113226 | 113227 | 113241 | 113251 | 113253 | 113256 | 113257 | 113260