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

(-)a/ill/ill-requests.pl (-24 / +40 lines)
Lines 243-272 if ( $backends_available ) { Link Here
243
                batches        => $batches
243
                batches        => $batches
244
            );
244
            );
245
        } else {
245
        } else {
246
            # Commit:
246
            my $valid_patron = Koha::Patrons->find( $params->{borrowernumber} );
247
            # Save the changes
247
            my $valid_biblio = Koha::Biblios->find( $params->{biblio_id} );
248
            $request->borrowernumber($params->{borrowernumber});
248
249
            $request->biblio_id($params->{biblio_id});
249
            if ( $params->{borrowernumber} && !$valid_patron || $params->{biblio_id} && !$valid_biblio ){
250
            $request->batch_id($params->{batch_id});
250
                my $error_result = {
251
            $request->branchcode($params->{branchcode});
251
                    error  => 1,
252
            $request->price_paid($params->{price_paid});
252
                    status => $valid_biblio ? 'invalid_patron' : 'invalid_biblio',
253
            $request->notesopac($params->{notesopac});
253
                    method => 'edit_action',
254
            $request->notesstaff($params->{notesstaff});
254
                    stage  => 'init',
255
            my $alias = (length $params->{status_alias} > 0) ?
255
                    next   => 'illview',
256
                $params->{status_alias} :
256
                };
257
                "-1";
257
                $template->param(
258
            $request->status_alias($alias);
258
                    whole   => $error_result,
259
            $request->store;
259
                    request => $request,
260
            my $backend_result = {
260
                );
261
                error   => 0,
261
            }else{
262
                status  => '',
262
                $request->borrowernumber( $params->{borrowernumber} );
263
                message => '',
263
                $request->biblio_id( $params->{biblio_id} );
264
                method  => 'edit_action',
264
                $request->batch_id( $params->{batch_id} );
265
                stage   => 'commit',
265
                $request->branchcode( $params->{branchcode} );
266
                next    => 'illlist',
266
                $request->price_paid( $params->{price_paid} );
267
                value   => {}
267
                $request->notesopac( $params->{notesopac} );
268
            };
268
                $request->notesstaff( $params->{notesstaff} );
269
            handle_commit_maybe($backend_result, $request);
269
                my $alias =
270
                    ( length $params->{status_alias} > 0 )
271
                    ? $params->{status_alias}
272
                    : "-1";
273
                $request->status_alias($alias);
274
                $request->store;
275
                my $backend_result = {
276
                    error   => 0,
277
                    status  => '',
278
                    message => '',
279
                    method  => 'edit_action',
280
                    stage   => 'commit',
281
                    next    => 'illlist',
282
                    value   => {}
283
                };
284
                handle_commit_maybe( $backend_result, $request );
285
            }
270
        }
286
        }
271
287
272
    } elsif ( $op eq 'moderate_action' ) {
288
    } elsif ( $op eq 'moderate_action' ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-2 / +8 lines)
Lines 131-137 Link Here
131
                    <!-- Dispatch on Status -->
131
                    <!-- Dispatch on Status -->
132
                    <p>We encountered an error:</p>
132
                    <p>We encountered an error:</p>
133
                    <p>
133
                    <p>
134
                      <pre>[% whole.message | html %] ([% whole.status | html %])</pre>
134
                    [% SWITCH whole.status %]
135
                    [%   CASE 'invalid_patron' %]
136
                        <pre>The Patron ID you entered is invalid.</pre>
137
                    [%   CASE 'invalid_biblio' %]
138
                        <pre>The Bibliographic record ID you entered is invalid.</pre>
139
                    [%   CASE %]
140
                        <pre>[% whole.message | html %] ([% whole.status | html %])</pre>
141
                    [% END %]
135
                    </p>
142
                    </p>
136
                [% END %]
143
                [% END %]
137
144
138
- 

Return to bug 35106