From 64fb3f9d0117376e79a0f94d740e1bf6e88c6763 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 30 Jan 2024 13:37:52 +0100 Subject: [PATCH] Bug 34478: Manual fix - opac-shareshelf Signed-off-by: Jonathan Druart --- .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 7 ++++--- opac/opac-shareshelf.pl | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt index 7dda3f48ae..a6bb7e1730 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt @@ -72,10 +72,11 @@ [% ELSIF op=='invite' %]
-
+ + [% INCLUDE 'csrf-token.inc' %] Share list
- +
  1. @@ -94,7 +95,7 @@
- [% ELSIF op=='conf_invite' %] + [% ELSIF op=='cud-conf_invite' %]
[% IF approvedaddress %]

An invitation to share list [% shelfname | html %] will be sent shortly to [% approvedaddress | html %].

diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl index 34354b88d6..2746edcfc1 100755 --- a/opac/opac-shareshelf.pl +++ b/opac/opac-shareshelf.pl @@ -49,7 +49,7 @@ if ( ! C4::Context->preference('virtualshelves') ) { my $pvar = _init( {} ); if ( !$pvar->{errcode} ) { show_invite($pvar) if $pvar->{op} eq 'invite'; - confirm_invite($pvar) if $pvar->{op} eq 'conf_invite'; + confirm_invite($pvar) if $pvar->{op} eq 'cud-conf_invite'; show_accept($pvar) if $pvar->{op} eq 'accept'; } load_template_vars($pvar); @@ -89,7 +89,7 @@ sub _init { sub check_common_errors { my ($param) = @_; - if ( $param->{op} !~ /^(invite|conf_invite|accept)$/ ) { + if ( $param->{op} !~ /^(invite|cud-conf_invite|accept)$/ ) { return 1; #no operation specified } if ( $param->{shelfnumber} !~ /^\d+$/ ) { @@ -180,7 +180,7 @@ sub notify_owner { C4::Letters::EnqueueLetter( { letter => $letter, - message_transport_type => 'cud-email', + message_transport_type => 'email', from_address => C4::Context->preference('KohaAdminEmailAddress'), to_address => $toaddr, } @@ -249,7 +249,7 @@ sub send_invitekey { C4::Letters::EnqueueLetter( { letter => $letter, - message_transport_type => 'cud-email', + message_transport_type => 'email', from_address => $fromaddr, to_address => $a, } -- 2.39.5