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

(-)a/ill/ill-requests.pl (-13 / +8 lines)
Lines 74-79 if ( $backends_available ) { Link Here
74
            csrf_token => Koha::Token->new->generate_csrf({
74
            csrf_token => Koha::Token->new->generate_csrf({
75
                session_id => scalar $cgi->cookie('CGISESSID'),
75
                session_id => scalar $cgi->cookie('CGISESSID'),
76
            }),
76
            }),
77
            ( $params->{error} ? ( error => $params->{error} ) : () ),
77
        );
78
        );
78
79
79
    } elsif ( $op eq 'create' ) {
80
    } elsif ( $op eq 'create' ) {
Lines 100-118 if ( $backends_available ) { Link Here
100
                );
101
                );
101
                $request = $new_request;
102
                $request = $new_request;
102
            } else {
103
            } else {
103
                # backend failure
104
                # Backend failure, redirect back to illview
104
                $backend_result = {
105
                print $cgi->redirect( '/cgi-bin/koha/ill/ill-requests.pl'
105
                    stage => 'commit',
106
                      . '?method=illview'
106
                    next  => 'illview',
107
                      . '&illrequest_id='
107
                    error => {
108
                      . $request->id
108
                        message => 'Migrating to backedn does not support migrate',
109
                      . '&error=migrate_target' );
109
                        status => 'Migrating to backedn does not support migrate'
110
                exit;
110
                    }
111
                };
112
                $template->param(
113
                    whole   => $backend_result,
114
                    request => $request
115
                );
116
            }
111
            }
117
        }
112
        }
118
        else {
113
        else {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-1 / +9 lines)
Lines 502-507 Link Here
502
502
503
                [% ELSIF query_type == 'illview' %]
503
                [% ELSIF query_type == 'illview' %]
504
                    [% req_status = request.status %]
504
                    [% req_status = request.status %]
505
506
                    [% IF error %]
507
                      [% IF error == 'migrate_target' %]
508
                          <div class="alert">
509
                              The backend you tried to migrate to does not yet support migrations, please try again with an alternative target.
510
                          </div>
511
                      [% END %]
512
                    [% END %]
513
505
                    <h1>Manage ILL request</h1>
514
                    <h1>Manage ILL request</h1>
506
                    <div id="request-toolbar" class="btn-toolbar">
515
                    <div id="request-toolbar" class="btn-toolbar">
507
                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
516
                        <a title="Edit request" id="ill-toolbar-btn-edit-action" class="btn btn-sm btn-default" href="/cgi-bin/koha/ill/ill-requests.pl?method=edit_action&amp;illrequest_id=[% request.illrequest_id | html %]">
508
- 

Return to bug 20640