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

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

Return to bug 35106