From b942adba7ea82cb64522fb8cf323f2c0fa6367b7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 3 Oct 2024 13:24:13 +0100 Subject: [PATCH] Bug 33260: (follow-up) Limit printing to non-pending on members page This patch prevent printing of notices in the 'pending' state. This ensures that email notices will not be skipped by process message queue at it's next run as we set the 'sent' status on print with this patchset. It still allows for printing of sent and failed messages which I believe is the purpose of the original patchset. --- .../intranet-tmpl/prog/en/modules/members/notices.tt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index 18a114499eb..784d5569530 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -46,7 +46,9 @@ [% INCLUDE 'messages.inc' %] [% INCLUDE 'members-toolbar.inc' %] -

Sent notices for [% INCLUDE 'patron-title.inc' %]

+

Notices for [% INCLUDE 'patron-title.inc' %]

+ +
Printing a notice will mark it as sent.
[% IF ( QUEUED_MESSAGES ) %]
@@ -70,7 +72,7 @@ [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] - + [% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] [% QUEUED_MESSAGE.subject | html %] @@ -119,7 +121,7 @@ [% END %] [% END %] - Print + [% IF QUEUED_MESSAGE.status != 'pending' %] Print[% END %] [% END %] @@ -130,7 +132,7 @@
[% ELSE %] -
There is no record of any messages that have been sent to this patron.
+
There is no record of any messages that have been queued for this patron.
[% END %] @@ -211,7 +213,7 @@ $(".select_all").click(function(e){ e.preventDefault(); - $("input[name='message_ids']").each(function(){ + $("input[name='message_ids']:not(:disabled)").each(function(){ $(this).prop("checked", true); }); }); -- 2.46.2