Bugzilla – Attachment 123331 Details for
Bug 28779
Calling request.pl with non-existent biblionumber gives internal server error
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28779: (QA follow-up) More specific message and soem cleanup
Bug-28779-QA-follow-up-More-specific-message-and-s.patch (text/plain), 4.11 KB, created by
Nick Clemens (kidclamp)
on 2021-07-30 14:40:41 UTC
(
hide
)
Description:
Bug 28779: (QA follow-up) More specific message and soem cleanup
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2021-07-30 14:40:41 UTC
Size:
4.11 KB
patch
obsolete
>From 82bb440a3d204633db554ac27b6f57e868fa0afe Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 30 Jul 2021 14:39:39 +0000 >Subject: [PATCH] Bug 28779: (QA follow-up) More specific message and soem > cleanup > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > .../prog/en/modules/reserve/request.tt | 29 +++++++++++++------ > reserve/request.pl | 4 +-- > 2 files changed, 22 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 5a8545c612..513b903f5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -64,7 +64,7 @@ > > <div class="main container-fluid"> > <div class="row"> >- [% IF ( multi_hold ) # No sidebar menu when placing multiple holds %] >+ [% IF ( multi_hold || nobiblio ) # No sidebar menu when placing multiple holds or biblio not found %] > <div class="col-md-10 col-md-offset-1"> > [% ELSE %] > <div class="col-sm-10 col-sm-push-2"> >@@ -72,6 +72,15 @@ > > <main> > >+ [% IF ( nobiblio ) %] >+ <div class="dialog alert"> >+ [%IF (multi_hold) %] >+ <strong>Cannot place hold:</strong> one or more records cannot be found. >+ [% ELSE %] >+ <strong>Cannot place hold:</strong> this record cannot be found. >+ [% END %] >+ </div> >+ [% END %] > [% IF ( noitems ) %] > <div class="dialog alert"> > [%IF (multi_hold) %] >@@ -93,13 +102,15 @@ > </div> > [% END %] > >- [% UNLESS ( multi_hold ) %] >- <h1>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]</h1> >- [% ELSE %] >- <h1>Confirm holds</h1> >+ [% UNLESS ( nobiblio ) %] >+ [% UNLESS ( multi_hold ) %] >+ <h1>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %]</h1> >+ [% ELSE %] >+ <h1>Confirm holds</h1> >+ [% END %] > [% END %] > >- [% UNLESS club OR patron OR patron.borrowernumber OR noitems %] >+ [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %] > [% IF ( messageborrower ) %] > <div class="dialog alert"> > <h3>Patron not found</h3> >@@ -323,7 +334,7 @@ > [% END %] > </form> > </fieldset> >- [% ELSIF NOT noitems # /UNLESS patron %] >+ [% ELSIF NOT ( noitems || nobiblio ) # /UNLESS patron %] > > [% IF ( checked_previously && !multi_hold ) %] > <div class="dialog alert"> >@@ -1004,7 +1015,7 @@ > > </main> > >- [% IF ( multi_hold ) # No sidebar menu when placing multiple holds %] >+ [% IF ( multi_hold || nobiblio ) # No sidebar menu when placing multiple holds or biblio not found %] > </div> <!-- /.col-md-10.col-md-offset-1 --> > [% ELSE %] > </div> <!-- /.col-sm-10.col-sm-push-2 --> >@@ -1537,7 +1548,7 @@ > return false; > }); > >- [% UNLESS ( patron || patron.borrowernumber || borrowers || noitems ) %] >+ [% UNLESS ( patron || patron.borrowernumber || borrowers || noitems || nobiblio ) %] > [% IF ( PatronAutoComplete ) %] > $( "#patron" ).autocomplete({ > source: "/cgi-bin/koha/circ/ysearch.pl", >diff --git a/reserve/request.pl b/reserve/request.pl >index df665587cf..094f587c97 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -309,8 +309,8 @@ foreach my $biblionumber (@biblionumbers) { > my $biblio = Koha::Biblios->find( $biblionumber ); > unless ($biblio) { > $biblioloopiter{noitems} = 1; >- $template->param('noitems' => 1); >- next; >+ $template->param('nobiblio' => 1); >+ last; > } > > my $force_hold_level; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28779
:
123280
|
123285
|
123304
|
123330
|
123331
|
123370
|
123371
|
123690
|
123691
|
123692