View | Details | Raw Unified | Return to bug 18397
Collapse All | Expand All

(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 1113-1119 sub GetQueuedMessages { Link Here
1113
1113
1114
    my $dbh = C4::Context->dbh();
1114
    my $dbh = C4::Context->dbh();
1115
    my $statement = << 'ENDSQL';
1115
    my $statement = << 'ENDSQL';
1116
SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued
1116
SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued, from_address, to_address
1117
FROM message_queue
1117
FROM message_queue
1118
ENDSQL
1118
ENDSQL
1119
1119
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-3 / +6 lines)
Lines 11-18 Link Here
11
//<![CDATA[
11
//<![CDATA[
12
    $(document).ready(function() {
12
    $(document).ready(function() {
13
    $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
13
    $("#noticestable").dataTable($.extend(true, {}, dataTablesDefaults, {
14
        "aaSorting": [[ 3, "desc" ]],
14
        "aaSorting": [[ 5, "desc" ]],
15
        "aoColumns": [ null,null,null,{ "sType": "title-string" } ],
15
        "aoColumns": [ null,null,null,null,null,{ "sType": "title-string" } ],
16
        "sPaginationType": "four_button"
16
        "sPaginationType": "four_button"
17
    }));
17
    }));
18
18
Lines 49-54 Link Here
49
	    <tr>
49
	    <tr>
50
		<th>Notice</th>
50
		<th>Notice</th>
51
		<th>Type</th>
51
		<th>Type</th>
52
                <th>Sender</th>
53
                <th>Recipient</th>
52
		<th>Status</th>
54
		<th>Status</th>
53
		<th>Time</th>
55
		<th>Time</th>
54
	    </tr>
56
	    </tr>
Lines 69-74 Link Here
69
            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
71
            [% ELSIF ( QUEUED_MESSAGE.message_transport_type == 'sms' ) %]sms
70
            [% ELSE %][% QUEUED_MESSAGE.message_transport_type %][% END %]
72
            [% ELSE %][% QUEUED_MESSAGE.message_transport_type %][% END %]
71
        </td>
73
        </td>
74
            <td>[% QUEUED_MESSAGE.from_address %]</td>
75
            <td>[% QUEUED_MESSAGE.to_address %]</td>
72
		<td>
76
		<td>
73
            [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
77
            [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]sent
74
            [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
78
            [% ELSIF ( QUEUED_MESSAGE.status == 'pending' ) %]pending
75
- 

Return to bug 18397