@@ -, +, @@
---
C4/Letters.pm | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 12 +++++++++++-
members/notices.pl | 2 ++
3 files changed, 14 insertions(+), 2 deletions(-)
--- a/C4/Letters.pm
+++ a/C4/Letters.pm
@@ -1096,7 +1096,7 @@ sub ResendMessage {
my $message = GetMessage( $message_id );
return unless $message;
- if ( $message->{status} eq 'failed' ) {
+ if ( $message->{status} ne 'pending' ) {
return ((C4::Letters::_set_message_status( {
message_id => $message_id,
status => 'pending',
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -70,9 +70,19 @@
[% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
[% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
- [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
+ [% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
[% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
[% ELSE %][% QUEUED_MESSAGE.status %][% END %]
+ [% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
+
+ [% END %]
|
[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] |
--- a/members/notices.pl
+++ a/members/notices.pl
@@ -58,6 +58,8 @@ if ( $op eq 'resend_notice' ) {
my $message = C4::Letters::GetMessage( $message_id );
if ( $message->{borrowernumber} = $borrowernumber ) {
C4::Letters::ResendMessage( $message_id );
+ # redirect to self to avoid form submission on refresh
+ print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
}
}
--