gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 35106: Validate entered borrowernumber and biblio_id 

Following up from the test plan of the previous patch:
1) Edit the request again, input gibberish in the Patron ID e.g. 'asdasd'
2) Hit 'Submit'
3) Notice you get a 'The Patron ID you entered is invalid.' message.
4) Edit again, try to empty the input on the Patron ID, hit 'Submit'.
5) Notice it saves the patron as null, as expected

Repeat the test plan, but now for the Bibliographic record ID, notice
the message 'The Bibliographic record ID you entered is invalid.' is
shown if a no biblio was found.

Signed-off-by: David Nind <david@davidnind.com>

squash this

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Pedro Amorim 2023-10-19 10:21:04 +00:00 committed by Katrin Fischer
parent fd450a86cb
commit c304eabc19
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ill/ill-requests.pl
View File

@ -241,30 +241,46 @@ if ( $backends_available ) {
batches => $batches
);
} else {
# Commit:
# Save the changes
$request->borrowernumber($params->{borrowernumber});
$request->biblio_id($params->{biblio_id});
$request->batch_id($params->{batch_id});
$request->branchcode($params->{branchcode});
$request->price_paid($params->{price_paid});
$request->notesopac($params->{notesopac});
$request->notesstaff($params->{notesstaff});
my $alias = (length $params->{status_alias} > 0) ?
$params->{status_alias} :
"-1";
$request->status_alias($alias);
$request->store;
my $backend_result = {
error => 0,
status => '',
message => '',
op => 'edit_action',
stage => 'commit',
next => 'illlist',
value => {}
};
handle_commit_maybe($backend_result, $request);
my $valid_patron = Koha::Patrons->find( $params->{borrowernumber} );
my $valid_biblio = Koha::Biblios->find( $params->{biblio_id} );
if ( $params->{borrowernumber} && !$valid_patron || $params->{biblio_id} && !$valid_biblio ){
my $error_result = {
error => 1,
status => $params->{borrowernumber} && !$valid_patron ? 'invalid_patron' : 'invalid_biblio',
op => 'edit_action',
stage => 'init',
next => 'illview',
};
$template->param(
whole => $error_result,
request => $request,
);
}else{
$request->borrowernumber( $params->{borrowernumber} );
$request->biblio_id( $params->{biblio_id} );
$request->batch_id( $params->{batch_id} );
$request->branchcode( $params->{branchcode} );
$request->price_paid( $params->{price_paid} );
$request->notesopac( $params->{notesopac} );
$request->notesstaff( $params->{notesstaff} );
my $alias =
( length $params->{status_alias} > 0 )
? $params->{status_alias}
: "-1";
$request->status_alias($alias);
$request->store;
my $backend_result = {
error => 0,
status => '',
message => '',
op => 'edit_action',
stage => 'commit',
next => 'illlist',
value => {}
};
handle_commit_maybe( $backend_result, $request );
}
}
} elsif ( $op eq 'moderate_action' ) {

9
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
View File

@ -136,7 +136,14 @@
<!-- Dispatch on Status -->
<p>We encountered an error:</p>
<p>
<pre>[% whole.message | html %] ([% whole.status | html %])</pre>
[% SWITCH whole.status %]
[% CASE 'invalid_patron' %]
<pre>The patron ID you entered is invalid.</pre>
[% CASE 'invalid_biblio' %]
<pre>The bibliographic record ID you entered is invalid.</pre>
[% CASE %]
<pre>[% whole.message | html %] ([% whole.status | html %])</pre>
[% END %]
</p>
[% END %]