Bugzilla – Attachment 175746 Details for
Bug 33260
Show message queue on staff interface and make notices printable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33260: (follow-up) Limit printing to non-pending on members page
Bug-33260-follow-up-Limit-printing-to-non-pending-.patch (text/plain), 4.37 KB, created by
Martin Renvoize (ashimema)
on 2024-12-19 13:01:57 UTC
(
hide
)
Description:
Bug 33260: (follow-up) Limit printing to non-pending on members page
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-12-19 13:01:57 UTC
Size:
4.37 KB
patch
obsolete
>From 55d458d5e563bef4f159c2b59c2e9cd613240fbe Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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' %] >- <h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1> >+ <h1>Notices for [% INCLUDE 'patron-title.inc' %]</h1> >+ >+ <div class="alert alert-warning">Printing a notice will mark it as sent.</div> > > [% IF ( QUEUED_MESSAGES ) %] > <div class="page-section"> >@@ -70,7 +72,7 @@ > <tbody> > [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] > <tr> >- <td><input type="checkbox" name="message_ids" value="[% QUEUED_MESSAGE.message_id | html %]" [% IF QUEDUE_MESSAGE.status == 'pending' %]disabled="disabled"[% END %]></td> >+ <td><input type="checkbox" name="message_ids" value="[% QUEUED_MESSAGE.message_id | html %]" [% IF QUEUED_MESSAGE.status == 'pending' %]disabled="disabled"[% END %]></td> > <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td> > <td> > <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" data-status="[% QUEUED_MESSAGE.status | html %]" data-borrowernumber="[% borrowernumber | html %]" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | uri %]&noticeid=[% QUEUED_MESSAGE.message_id | uri %]">[% QUEUED_MESSAGE.subject | html %]</a> >@@ -119,7 +121,7 @@ > [% END %] > [% END %] > </td> >- <td class="actions"><a target="_blank" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/print_notice.pl?message_ids=[% QUEUED_MESSAGE.message_id | uri %]"><i class="fa fa-print"></i> Print</a></td> >+ <td class="actions">[% IF QUEUED_MESSAGE.status != 'pending' %]<a target="_blank" class="btn btn-default btn-xs" href="/cgi-bin/koha/tools/print_notice.pl?message_ids=[% QUEUED_MESSAGE.message_id | uri %]"><i class="fa fa-print"></i> Print</a>[% END %]</td> > </tr> > [% END %] > </tbody> >@@ -130,7 +132,7 @@ > </form> > </div> <!-- /.page-section --> > [% ELSE %] >- <div class="alert alert-info">There is no record of any messages that have been sent to this patron.</div> >+ <div class="alert alert-info">There is no record of any messages that have been queued for this patron.</div> > [% END %] > </main> > </div> <!-- /.col-md-10.order-md-2 --> >@@ -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.47.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33260
:
148437
|
148438
|
148439
|
148440
|
148943
|
149009
|
149413
|
149581
|
149593
|
149594
|
149595
|
149596
|
149597
|
149598
|
150346
|
150347
|
154927
|
154928
|
157383
|
157384
|
157385
|
157386
|
158852
|
158853
|
158854
|
158855
|
162570
|
162571
|
162572
|
162573
|
162574
|
162624
|
162625
|
162677
|
162678
|
162679
|
162680
|
162681
|
164783
|
164784
|
164785
|
164786
|
164787
|
165238
|
165239
|
165717
|
165939
|
165946
|
165947
|
165948
|
165949
|
165950
|
165951
|
166020
|
166178
|
166335
|
166336
|
166337
|
166338
|
166339
|
166340
|
166341
|
166342
|
166343
|
166344
|
166345
|
166362
|
166363
|
166364
|
166365
|
166366
|
166367
|
166368
|
166369
|
166370
|
166371
|
166372
|
166373
|
167909
|
167910
|
167911
|
167912
|
167913
|
167914
|
167915
|
167916
|
167917
|
167918
|
167919
|
167920
|
172247
|
172248
|
172303
|
172307
|
172308
|
172309
|
172310
|
172311
|
172312
|
172313
|
172314
|
172315
|
172316
|
172317
|
172318
|
172319
|
172320
|
172321
|
172322
|
172342
|
172343
|
172344
|
172345
|
172346
|
172347
|
172348
|
172349
|
172350
|
172351
|
172352
|
172353
|
172354
|
172355
|
172356
|
172357
|
172358
|
172359
|
172379
|
175501
|
175502
|
175503
|
175504
|
175505
|
175506
|
175507
|
175508
|
175509
|
175510
|
175511
|
175512
|
175513
|
175514
|
175515
|
175516
|
175517
|
175518
|
175519
|
175520
|
175521
|
175522
|
175523
|
175524
|
175525
|
175530
|
175537
|
175538
|
175539
|
175540
|
175541
|
175542
|
175543
|
175544
|
175545
|
175546
|
175547
|
175548
|
175549
|
175550
|
175551
|
175552
|
175553
|
175554
|
175555
|
175556
|
175557
|
175558
|
175559
|
175560
|
175561
|
175562
|
175563
|
175730
|
175731
|
175732
|
175733
|
175734
|
175735
|
175736
|
175737
|
175738
|
175739
|
175740
|
175741
|
175742
|
175743
|
175744
|
175745
|
175746
|
175747
|
175748
|
175749
|
175750
|
175751
|
175752
|
175753
|
175754
|
175755
|
175756
|
178733
|
178734
|
178735
|
178736
|
178737
|
178738
|
178739
|
178740
|
178741
|
178742
|
178743
|
178744
|
178745
|
178746
|
178747
|
178748
|
178749
|
178750
|
178751
|
178752
|
178753
|
178754
|
178755
|
178756
|
178757
|
178758
|
178759