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

(-)a/Koha/Illrequest.pm (-1 / +26 lines)
Lines 1-6 Link Here
1
package Koha::Illrequest;
1
package Koha::Illrequest;
2
2
3
# Copyright PTFS Europe 2016
3
# Copyright PTFS Europe 2016,2018
4
#
4
#
5
# This file is part of Koha.
5
# This file is part of Koha.
6
#
6
#
Lines 1119-1124 EOF Link Here
1119
        my $result = sendmail(%mail);
1119
        my $result = sendmail(%mail);
1120
        if ( $result ) {
1120
        if ( $result ) {
1121
            $self->status("GENREQ")->store;
1121
            $self->status("GENREQ")->store;
1122
            $self->_backend_capability(
1123
                'set_requested_partners',
1124
                {
1125
                    request => $self,
1126
                    to => $to
1127
                }
1128
            );
1122
            return {
1129
            return {
1123
                error   => 0,
1130
                error   => 0,
1124
                status  => '',
1131
                status  => '',
Lines 1205-1210 sub store { Link Here
1205
    return $ret;
1212
    return $ret;
1206
}
1213
}
1207
1214
1215
=head3 requested_partners
1216
1217
    my $partners_string = $illRequest->requested_partners;
1218
1219
Return the string representing the email addresses of the partners to
1220
whom a request has been sent
1221
1222
=cut
1223
1224
sub requested_partners {
1225
    my ( $self ) = @_;
1226
    return $self->_backend_capability(
1227
        'get_requested_partners',
1228
        { request => $self }
1229
    );
1230
}
1231
1208
=head3 TO_JSON
1232
=head3 TO_JSON
1209
1233
1210
    $json = $illrequest->TO_JSON
1234
    $json = $illrequest->TO_JSON
Lines 1239-1244 sub _type { Link Here
1239
=head1 AUTHOR
1263
=head1 AUTHOR
1240
1264
1241
Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
1265
Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
1266
Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
1242
1267
1243
=cut
1268
=cut
1244
1269
(-)a/Koha/REST/V1/Illrequests.pm (+3 lines)
Lines 161-166 sub list { Link Here
161
        if ($embed{status_alias}) {
161
        if ($embed{status_alias}) {
162
            $to_push->{status_alias} = $req->statusalias;
162
            $to_push->{status_alias} = $req->statusalias;
163
        }
163
        }
164
        if ($embed{requested_partners}) {
165
            $to_push->{requested_partners} = $req->requested_partners;
166
        }
164
        push @output, $to_push;
167
        push @output, $to_push;
165
    }
168
    }
166
169
(-)a/api/v1/swagger/paths/illrequests.json (-1 / +2 lines)
Lines 17-23 Link Here
17
                        "patron",
17
                        "patron",
18
                        "library",
18
                        "library",
19
                        "capabilities",
19
                        "capabilities",
20
                        "metadata"
20
                        "metadata",
21
                        "requested_partners"
21
                    ]
22
                    ]
22
                }
23
                }
23
            }, {
24
            }, {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-4 / +14 lines)
Lines 363-368 Link Here
363
                                            [% request.statusalias.lib | html %]
363
                                            [% request.statusalias.lib | html %]
364
                                        [% ELSE %]
364
                                        [% ELSE %]
365
                                            [% request.capabilities.$req_status.name | html%]
365
                                            [% request.capabilities.$req_status.name | html%]
366
                                            [% IF request.requested_partners.length > 0 %]
367
                                                ([% request.requested_partners | html %])
368
                                            [% END %]
366
                                        [% END %]
369
                                        [% END %]
367
                                    </li>
370
                                    </li>
368
                                    <li class="updated">
371
                                    <li class="updated">
Lines 787-807 Link Here
787
                        var status_name = meta.settings.oInit.originalData[0].capabilities[
790
                        var status_name = meta.settings.oInit.originalData[0].capabilities[
788
                            row.status
791
                            row.status
789
                        ].name;
792
                        ].name;
790
                        return getStatusName(status_name);
793
                        return getStatusName(status_name, row);
791
                    } else {
794
                    } else {
792
                        return '';
795
                        return '';
793
                    }
796
                    }
794
                }
797
                }
795
            };
798
            };
796
799
797
            var getStatusName = function(origName) {
800
            var getStatusName = function(origName, row) {
798
                switch( origName ) {
801
                switch( origName ) {
799
                    case "New request":
802
                    case "New request":
800
                        return _("New request");
803
                        return _("New request");
801
                    case "Requested":
804
                    case "Requested":
802
                        return _("Requested");
805
                        return _("Requested");
803
                    case "Requested from partners":
806
                    case "Requested from partners":
804
                        return _("Requested from partners");
807
                        var statStr = _("Requested from partners");
808
                        if (
809
                            row.hasOwnProperty('requested_partners') &&
810
                            row.requested_partners &&
811
                            row.requested_partners.length > 0
812
                        ) {
813
                            statStr += ' (' + row.requested_partners + ')';
814
                        }
815
                        return statStr;
805
                    case "Request reverted":
816
                    case "Request reverted":
806
                        return _("Request reverted");
817
                        return _("Request reverted");
807
                    case "Queued request":
818
                    case "Queued request":
808
- 

Return to bug 20563