Bugzilla – Attachment 7657 Details for
Bug 6875
de-nesting C4 packages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[FAILED_QA]Bug 6875 cleaning opac-detail.pl
Bug-6875-cleaning-opac-detailpl.patch (text/plain), 4.17 KB, created by
Paul Poulain
on 2012-02-15 14:45:59 UTC
(
hide
)
Description:
[FAILED_QA]Bug 6875 cleaning opac-detail.pl
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2012-02-15 14:45:59 UTC
Size:
4.17 KB
patch
obsolete
>From b1c4670cf5082d67474eeed460b0d73300c80881 Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Sat, 17 Sep 2011 00:42:45 +0200 >Subject: [PATCH] Bug 6875 cleaning opac-detail.pl > >C4::Tags and C4::Reviews used only if the feature is activated. >Changing the use to a require inside the if (after testing it's activated) >For libraries that have activated both, that means no change, but for others, it's an improvement >--- > opac/opac-detail.pl | 50 ++++++++++++++++++++++++++------------------------ > 1 files changed, 26 insertions(+), 24 deletions(-) > >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index b5a25a8..e5a3456 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -31,12 +31,10 @@ use C4::Output; > use C4::Biblio; > use C4::Items; > use C4::Circulation; >-use C4::Tags qw(get_tags); > use C4::Dates qw/format_date/; > use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn); > use C4::External::Amazon; > use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syndetics_toc get_syndetics_excerpt get_syndetics_reviews get_syndetics_anotes ); >-use C4::Review; > use C4::Members; > use C4::VirtualShelves; > use C4::XSLT; >@@ -616,28 +614,33 @@ if ( C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowRe > $libravatar_enabled = 1; > } > } >- >-my $reviews = getreviews( $biblionumber, 1 ); >-my $loggedincommenter; >-foreach ( @$reviews ) { >- my $borrowerData = GetMember('borrowernumber' => $_->{borrowernumber}); >- # setting some borrower info into this hash >- $_->{title} = $borrowerData->{'title'}; >- $_->{surname} = $borrowerData->{'surname'}; >- $_->{firstname} = $borrowerData->{'firstname'}; >- if ($libravatar_enabled and $borrowerData->{'email'}) { >- $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); >+if (C4::Context->preference("reviewson")) { >+ require C4::Review; >+ my $reviews = C4::Review::getreviews( $biblionumber, 1 ); >+ my $loggedincommenter; >+ foreach ( @$reviews ) { >+ my $borrowerData = GetMember('borrowernumber' => $_->{borrowernumber}); >+ # setting some borrower info into this hash >+ $_->{title} = $borrowerData->{'title'}; >+ $_->{surname} = $borrowerData->{'surname'}; >+ $_->{firstname} = $borrowerData->{'firstname'}; >+ if ($libravatar_enabled and $borrowerData->{'email'}) { >+ $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); >+ } >+ $_->{userid} = $borrowerData->{'userid'}; >+ $_->{cardnumber} = $borrowerData->{'cardnumber'}; >+ $_->{datereviewed} = format_date($_->{datereviewed}); >+ if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { >+ $_->{your_comment} = 1; >+ $loggedincommenter = 1; >+ } > } >- $_->{userid} = $borrowerData->{'userid'}; >- $_->{cardnumber} = $borrowerData->{'cardnumber'}; >- $_->{datereviewed} = format_date($_->{datereviewed}); >- if ($borrowerData->{'borrowernumber'} eq $borrowernumber) { >- $_->{your_comment} = 1; >- $loggedincommenter = 1; >- } >+ $template->param( >+ reviews => $reviews, >+ loggedincommenter => $loggedincommenter >+ ); > } > >- > if(C4::Context->preference("ISBD")) { > $template->param(ISBD => 1); > } >@@ -648,8 +651,6 @@ $template->param( > biblionumber => $biblionumber, > subscriptions => \@subs, > subscriptionsnumber => $subscriptionsnumber, >- reviews => $reviews, >- loggedincommenter => $loggedincommenter > ); > > # Lists >@@ -873,12 +874,13 @@ if (C4::Context->preference("BakerTaylorEnabled")) { > > my $tag_quantity; > if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) { >+ require C4::Tags; > $template->param( > TagsEnabled => 1, > TagsShowOnDetail => $tag_quantity, > TagsInputOnDetail => C4::Context->preference('TagsInputOnDetail') > ); >- $template->param(TagLoop => get_tags({biblionumber=>$biblionumber, approved=>1, >+ $template->param(TagLoop => C4::Tags::get_tags({biblionumber=>$biblionumber, approved=>1, > 'sort'=>'-weight', limit=>$tag_quantity})); > } > >-- >1.7.5.4
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 6875
:
5442
|
5443
|
5496
|
5497
|
5498
|
5499
|
5500
|
5501
|
5502
|
5503
|
5504
|
5505
|
5506
|
5507
|
5508
|
5509
|
5510
|
5511
|
5512
|
7359
|
7360
|
7361
|
7362
|
7363
|
7364
|
7365
|
7652
|
7654
|
7655
|
7656
| 7657 |
7658
|
7770
|
7771
|
7808
|
7844
|
8095
|
8133
|
8134
|
8135