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

(-)a/Koha/Illrequest.pm (-1 / +1 lines)
Lines 996-1002 sub _censor { Link Here
996
996
997
    my $partners_string = $illRequest->requested_partners;
997
    my $partners_string = $illRequest->requested_partners;
998
998
999
Return the string representing the email addresses of the parters to
999
Return the string representing the email addresses of the partners to
1000
whom a request has been sent
1000
whom a request has been sent
1001
1001
1002
=cut
1002
=cut
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-21 / +10 lines)
Lines 49-55 Link Here
49
            'biblio_id',
49
            'biblio_id',
50
            'library',
50
            'library',
51
            'status',
51
            'status',
52
            'additional_status',
53
            'updated',
52
            'updated',
54
            'illrequest_id',
53
            'illrequest_id',
55
            'action'
54
            'action'
Lines 150-156 Link Here
150
                    case "Requested":
149
                    case "Requested":
151
                        return _("Requested");
150
                        return _("Requested");
152
                    case "Requested from partners":
151
                    case "Requested from partners":
153
                        return _("Requested from partners");
152
                        var statStr = _("Requested from partners");
153
                        if (
154
                            row.hasOwnProperty('requested_partners') &&
155
                            row.requested_partners &&
156
                            row.requested_partners.length > 0
157
                        ) {
158
                            statStr += ' (' + row.requested_partners + ')';
159
                        }
160
                        return statStr;
154
                    case "Request reverted":
161
                    case "Request reverted":
155
                        return _("Request reverted");
162
                        return _("Request reverted");
156
                    case "Queued request":
163
                    case "Queued request":
Lines 169-186 Link Here
169
            }
176
            }
170
        };
177
        };
171
178
172
        // Render function for additional status
173
        var createAdditional = function(data, type, row) {
174
            return (
175
                row.hasOwnProperty('requested_partners') &&
176
                row.requested_partners &&
177
                row.requested_partners.length > 0
178
            ) ?
179
                "Requested from:<br>" +
180
                row.requested_partners.replace('; ','<br>') :
181
                '';
182
        };
183
184
        // Render function for creating a row's action link
179
        // Render function for creating a row's action link
185
        var createActionLink = function(data, type, row) {
180
        var createActionLink = function(data, type, row) {
186
            return '<a class="btn btn-default btn-sm" ' +
181
            return '<a class="btn btn-default btn-sm" ' +
Lines 208-217 Link Here
208
                name: _("Status"),
203
                name: _("Status"),
209
                func: createStatus
204
                func: createStatus
210
            },
205
            },
211
            additional_status: {
212
                name: _("Additional status"),
213
                func: createAdditional
214
            },
215
            biblio_id: {
206
            biblio_id: {
216
                name: _("Bibliograpic record ID"),
207
                name: _("Bibliograpic record ID"),
217
                func: createBiblioLink
208
                func: createBiblioLink
Lines 556-562 Link Here
556
                                    <span class="label status">Status:</span>
547
                                    <span class="label status">Status:</span>
557
                                    [% request.capabilities.$req_status.name | html %]
548
                                    [% request.capabilities.$req_status.name | html %]
558
                                    [% IF request.requested_partners.length > 0 %]
549
                                    [% IF request.requested_partners.length > 0 %]
559
                                        ([% request.requested_partners %])
550
                                        ([% request.requested_partners | html %])
560
                                    [% END %]
551
                                    [% END %]
561
                                </div>
552
                                </div>
562
                                <div class="updated">
553
                                <div class="updated">
Lines 639-645 Link Here
639
                                    <th>Bibliographic record ID</th>
630
                                    <th>Bibliographic record ID</th>
640
                                    <th>Library</th>
631
                                    <th>Library</th>
641
                                    <th>Status</th>
632
                                    <th>Status</th>
642
                                    <th>Additional status</th>
643
                                    <th>Updated on</th>
633
                                    <th>Updated on</th>
644
                                    <th>Request number</th>
634
                                    <th>Request number</th>
645
                                    <th class="actions"></th>
635
                                    <th class="actions"></th>
646
- 

Return to bug 20563