Bugzilla – Attachment 138898 Details for
Bug 31316
Remove GetItemsInfo from opac-sendbasket
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31316: Remove GetItemsInfo from opac-sendbasket
Bug-31316-Remove-GetItemsInfo-from-opac-sendbasket.patch (text/plain), 6.68 KB, created by
Owen Leonard
on 2022-08-09 11:25:18 UTC
(
hide
)
Description:
Bug 31316: Remove GetItemsInfo from opac-sendbasket
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2022-08-09 11:25:18 UTC
Size:
6.68 KB
patch
obsolete
>From b44b987ebc31ae985a775bbcba0ab06367359ad9 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 3 Jun 2022 08:20:17 +0200 >Subject: [PATCH] Bug 31316: Remove GetItemsInfo from opac-sendbasket > >Bug 27272 is going to remove C4::Items::GetItemsInfo in favour of Koha::Items->search. > >Here we are going to deal with opac-sendbasket > >Test plan: >List items on the modified view and confirm that all the info is >displayed correctly > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt | 8 +++++--- > .../opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt | 8 +++++--- > opac/opac-sendbasket.pl | 8 ++------ > opac/opac-sendshelf.pl | 7 ++----- > 4 files changed, 14 insertions(+), 17 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >index 00f93e7e0a..38978d299a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt >@@ -1,6 +1,8 @@ > [% USE raw %] > [% USE HtmlToText %] > [% USE Koha %] >+[% USE AuthorisedValues %] >+[% USE Branches %] > > <SUBJECT> > Your cart >@@ -143,12 +145,12 @@ Your cart > In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber | html %] > </p> > [% END %] >- [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] >+ [% IF ( BIBLIO_RESULT.ITEM_RESULTS.count ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname | $raw %] >- [% ITEM_RESULT.location | $raw %] >+ [% Branches.GetName(ITEM_RESULT.holdingbranch) | $raw %] >+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %]%] > [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber | $raw %])[% END %] > [% ITEM_RESULT.barcode | $raw %] > </li>[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >index be952e2399..168dce74be 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >@@ -1,4 +1,6 @@ > [% USE raw %] >+[% USE AuthorisedValues %] >+[% USE Branches %] > <SUBJECT> > Your list : [% shelfname | $raw %] > <END_SUBJECT> >@@ -145,12 +147,12 @@ Your list : [% shelfname | $raw %] > In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber | html %] > </p> > [% END %] >- [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %] >+ [% IF ( BIBLIO_RESULT.ITEM_RESULTS.count ) %] > <p>Items: > <ul> > [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li> >- [% ITEM_RESULT.branchname | $raw %] >- [% ITEM_RESULT.location | $raw %] >+ [% Branches.GetName(ITEM_RESULT.holdingbranch) | $raw %] >+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] > [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber | $raw %])[% END %] > [% ITEM_RESULT.barcode | $raw %] > </li>[% END %] >diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl >index fcc49e0f7e..cc33d121db 100755 >--- a/opac/opac-sendbasket.pl >+++ b/opac/opac-sendbasket.pl >@@ -27,7 +27,6 @@ use Try::Tiny qw( catch try ); > use C4::Biblio qw( > GetMarcSubjects > ); >-use C4::Items qw( GetItemsInfo ); > use C4::Auth qw( get_template_and_user ); > use C4::Output qw( output_html_with_http_headers ); > use C4::Templates; >@@ -49,8 +48,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( > my $bib_list = $query->param('bib_list') || ''; > my $email_add = $query->param('email_add'); > >-my $dbh = C4::Context->dbh; >- > if ( $email_add ) { > die "Wrong CSRF token" unless Koha::Token->new->check_csrf({ > session_id => scalar $query->cookie('CGISESSID'), >@@ -88,19 +85,18 @@ if ( $email_add ) { > my $marcauthorsarray = $biblio->get_marc_authors; > my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); > >- my @items = GetItemsInfo( $biblionumber ); >+ my $items = $biblio->items->search_ordered->filter_by_visible_in_opac({ patron => $patron }); > > my $hasauthors = 0; > if($dat->{'author'} || @$marcauthorsarray) { > $hasauthors = 1; > } >- > > $dat->{MARCSUBJCTS} = $marcsubjctsarray; > $dat->{MARCAUTHORS} = $marcauthorsarray; > $dat->{HASAUTHORS} = $hasauthors; > $dat->{'biblionumber'} = $biblionumber; >- $dat->{ITEM_RESULTS} = \@items; >+ $dat->{ITEM_RESULTS} = $items; > > $iso2709 .= $record->as_usmarc(); > >diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl >index 915428111a..17afa1a82e 100755 >--- a/opac/opac-sendshelf.pl >+++ b/opac/opac-sendshelf.pl >@@ -30,7 +30,6 @@ use C4::Biblio qw( > GetMarcISBN > GetMarcSubjects > ); >-use C4::Items qw( GetItemsInfo ); > use C4::Output qw( output_html_with_http_headers ); > use Koha::Biblios; > use Koha::Email; >@@ -56,8 +55,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( > my $shelfid = $query->param('shelfid'); > my $email = $query->param('email'); > >-my $dbh = C4::Context->dbh; >- > my $shelf = Koha::Virtualshelves->find( $shelfid ); > if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) { > if ( $email ) { >@@ -97,13 +94,13 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) { > my $marcauthorsarray = $biblio->get_marc_authors; > my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); > >- my @items = GetItemsInfo( $biblionumber ); >+ my $items = $biblio->items->search_ordered->filter_by_visible_in_opac({ patron => $patron }); > > $dat->{ISBN} = GetMarcISBN($record, $marcflavour); > $dat->{MARCSUBJCTS} = $marcsubjctsarray; > $dat->{MARCAUTHORS} = $marcauthorsarray; > $dat->{'biblionumber'} = $biblionumber; >- $dat->{ITEM_RESULTS} = \@items; >+ $dat->{ITEM_RESULTS} = $items; > $dat->{HASAUTHORS} = $dat->{'author'} || @$marcauthorsarray; > > $iso2709 .= $record->as_usmarc(); >-- >2.20.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=138898">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31316
:
138826
|
138833
|
138898
|
138903
|
138904