Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34478: Manual fix - opac-shareshelf

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2024-01-30 13:37:52 +01:00
parent 43e01c43f0
commit 64fb3f9d01
Signed by: jonathan.druart
GPG key ID: A085E712BEF0E0F0
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
View file

@ -72,10 +72,11 @@
[% ELSIF op=='invite' %]
<div id="invite">
<form method="get" id="share_list">
<form method="post" id="share_list">
[% INCLUDE 'csrf-token.inc' %]
<legend class="sr-only">Share list</legend>
<fieldset class="rows">
<input type="hidden" name="op" value="conf_invite"/>
<input type="hidden" name="op" value="cud-conf_invite"/>
<input type="hidden" name="shelfnumber" value="[% shelfnumber | html %]"/>
<ol>
<li>
@ -94,7 +95,7 @@
</form> <!-- /#share_list -->
</div> <!-- /#invite -->
[% ELSIF op=='conf_invite' %]
[% ELSIF op=='cud-conf_invite' %]
<div id="conf_invite">
[% IF approvedaddress %]
<p>An invitation to share list <em>[% shelfname | html %]</em> will be sent shortly to [% approvedaddress | html %].</p>

8
opac/opac-shareshelf.pl
View file

@ -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,
}