fbb7097b1d
This patch allows to resend both sent and failed messages. With messages in 'sent' status, we have to be careful not to accidentally send sent messages again. With the previous patch using GET request, this was likely to happen because of browser storing the GET parameters. This patch changes request method from GET to POST. Instead of a simple link, we now have a form element. In notices.pl we redirect back to notices.pl, because with POST there is a risk of resending the message accidentally by form resubmission at refresh. To test, find/create a Patron that has sent or failed notices in message_queue: 1. Enable EnchancedMessagingPreferences system preference 2. Go to Patrons -> Notices 3. In the Notice column, click the title of the sent or failed message 4. Observe that there is nothing for resending the sent or failed message 5. Apply the patches. 6. Reload Notices page and repeat step 3 7. Observe that there is now a link "Resend" in the Status-column 8. Click Resend 9. Observe that the message gets into 'pending' status Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
104 lines
3.7 KiB
Text
104 lines
3.7 KiB
Text
[% USE Koha %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aaSorting": [[ 3, "desc" ]],
|
|
"aoColumns": [ null,null,null,{ "sType": "title-string" } ],
|
|
"sPaginationType": "four_button"
|
|
}));
|
|
|
|
$(".notice").hide();
|
|
$(".notice-title").click(function(e){
|
|
$(this).closest("tr").children().children(".notice").toggle();
|
|
e.preventDefault();
|
|
});
|
|
|
|
});
|
|
//]]>
|
|
</script>
|
|
<style type="text/css">
|
|
p.notice { display: none; }
|
|
a.notice-title { font-weight: bold; display: block; }
|
|
</style>
|
|
</head>
|
|
<body id="pat_notices" class="pat">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'patron-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › Sent notices for [% INCLUDE 'patron-title.inc' %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% INCLUDE 'members-toolbar.inc' %]
|
|
<h1>Sent notices for [% INCLUDE 'patron-title.inc' %]</h1>
|
|
|
|
[% IF ( QUEUED_MESSAGES ) %]
|
|
<table id="noticestable">
|
|
<thead>
|
|
<tr>
|
|
<th>Notice</th>
|
|
<th>Type</th>
|
|
<th>Status</th>
|
|
<th>Time</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %]
|
|
<tr>
|
|
<td>
|
|
<a class="notice-title" href="#">[% QUEUED_MESSAGE.subject %]</a>
|
|
<div class="notice">
|
|
[% QUEUED_MESSAGE.content FILTER html_line_break %]
|
|
</div>
|
|
</td>
|
|
<td>
|
|
[% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email
|
|
[% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'print' ) %]print
|
|
[% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'feed' ) %]feed
|
|
[% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
|
|
[% ELSE %][% QUEUED_MESSAGE.message_transport_type %][% END %]
|
|
</td>
|
|
<td>
|
|
[% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
|
|
[% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
|
|
[% ELSIF ( QUEUED_MESSAGE.status == 'failed' ) %]failed
|
|
[% ELSIF ( QUEUED_MESSAGE.status == 'deleted' ) %]deleted
|
|
[% ELSE %][% QUEUED_MESSAGE.status %][% END %]
|
|
[% IF ( QUEUED_MESSAGE.status != 'pending' ) %]
|
|
<div class="notice">
|
|
<form action="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]" method="POST">
|
|
<input type="hidden" name="op" value="resend_notice" />
|
|
<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
|
|
<input type="hidden" name="message_id" value="[% QUEUED_MESSAGE.message_id %]" />
|
|
<a href="#" onclick="$(this).closest('form').submit();return false;" title="Attempt to resend the notice">Resend</a>
|
|
</form>
|
|
</div>
|
|
[% END %]
|
|
</td>
|
|
<td><span title="[% QUEUED_MESSAGE.time_queued %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</span></td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog message">There is no record of any messages that have been sent to this patron.</div>
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
|
|
<div class="yui-b">
|
|
[% INCLUDE 'circ-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|