Bug 24016: manager_id in Koha::Patron::Message->store should not depend on userenv...

Koha::Patron::Message->store has this

    my $userenv = C4::Context->userenv;
    $self->manager_id( $userenv ? $userenv->{number} : undef);

This breaks in REST API when userenv is not set.

Let API user pass manager_id without relying on C4::Context->userenv.

To test:
1. prove t/db_dependent/Koha/Patron/Messages.t
2. Observe success

Sponsored-by: Koha-Suomi Oy
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 49eac22b1f977b439e5d3f8f313dee3164719b60)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e13770ad11b4b504413ef020770cd15e8ee55bbc)

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

diff --git a/Koha/Patron/Message.pm b/Koha/Patron/Message.pm
index ea5b9dc..8383780 100644 (file)
--- a/Koha/Patron/Message.pm
+++ b/Koha/Patron/Message.pm
@@ -49,8 +49,10 @@ sub store {
               and $self->message_type
               and $self->branchcode;
 
-    my $userenv = C4::Context->userenv;
-    $self->manager_id( $userenv ? $userenv->{number} : undef);
+    unless (defined $self->manager_id) {
+        my $userenv = C4::Context->userenv;
+        $self->manager_id( $userenv ? $userenv->{number} : undef);
+    }
 
     C4::Log::logaction( "MEMBERS", "ADDCIRCMESSAGE", $self->borrowernumber, $self->message )
         if C4::Context->preference("BorrowersLog");