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

(-)a/Koha/Illrequest.pm (-3 / +3 lines)
Lines 258-264 sub status { Link Here
258
            $current_status_alias :
258
            $current_status_alias :
259
            $current_status;
259
            $current_status;
260
        my $ret = $self->SUPER::status($new_status)->store;
260
        my $ret = $self->SUPER::status($new_status)->store;
261
        if ($ret) {
261
        if ($current_status_alias) {
262
            # This is hackery to enable us to undefine
262
            # This is hackery to enable us to undefine
263
            # status_alias, since we need to have an overloaded
263
            # status_alias, since we need to have an overloaded
264
            # status_alias method to get us around the problem described
264
            # status_alias method to get us around the problem described
Lines 267-280 sub status { Link Here
267
            # We need a way of passing implied undef to nullify status_alias
267
            # We need a way of passing implied undef to nullify status_alias
268
            # so we pass -1, which is special cased in the overloaded setter
268
            # so we pass -1, which is special cased in the overloaded setter
269
            $self->status_alias("-1");
269
            $self->status_alias("-1");
270
        } else {
270
            my $logger = Koha::Illrequest::Logger->new;
271
            my $logger = Koha::Illrequest::Logger->new;
271
            $logger->log_status_change(
272
            $logger->log_status_change(
272
                $self,
273
                $self,
273
                $new_status
274
                $new_status
274
            );
275
            );
275
        } else {
276
            delete $self->{previous_status};
277
        }
276
        }
277
        delete $self->{previous_status};
278
        return $ret;
278
        return $ret;
279
    } else {
279
    } else {
280
        return $current_status;
280
        return $current_status;
(-)a/Koha/Illrequest/Logger.pm (-1 / +1 lines)
Lines 243-249 sub get_request_logs { Link Here
243
    my $aliases = GetAuthorisedValues('ILLSTATUS');
243
    my $aliases = GetAuthorisedValues('ILLSTATUS');
244
    my $alias_hash;
244
    my $alias_hash;
245
    foreach my $alias(@{$aliases}) {
245
    foreach my $alias(@{$aliases}) {
246
        $alias_hash->{$alias->{id}} = $alias;
246
        $alias_hash->{$alias->{authorised_value}} = $alias;
247
    }
247
    }
248
    foreach my $log(@{$logs}) {
248
    foreach my $log(@{$logs}) {
249
        $log->{aliases} = $alias_hash;
249
        $log->{aliases} = $alias_hash;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt (-3 / +2 lines)
Lines 3-9 Link Here
3
[% IF log.info.status_before %]
3
[% IF log.info.status_before %]
4
[% before = log.info.status_before %]
4
[% before = log.info.status_before %]
5
[%
5
[%
6
    display_before = log.info.status_before.match('^\d+$') ?
6
    display_before = log.aliases.$before ?
7
        log.aliases.$before.lib :
7
        log.aliases.$before.lib :
8
        request.capabilities.$before.name
8
        request.capabilities.$before.name
9
%]
9
%]
Lines 11-17 from "[% display_before %]" Link Here
11
[% END %]
11
[% END %]
12
[% after = log.info.status_after %]
12
[% after = log.info.status_after %]
13
[%
13
[%
14
    display_after = log.info.status_after.match('^\d+$') ?
14
    display_after = log.aliases.$after ?
15
        log.aliases.$after.lib :
15
        log.aliases.$after.lib :
16
        request.capabilities.$after.name;
16
        request.capabilities.$after.name;
17
%]
17
%]
18
- 

Return to bug 20750