Bugzilla – Attachment 157640 Details for
Bug 31383
Additional contents: We need a parent and child table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31383: (bug 29691 follow-up) Remove get_opac_news_by_id
Bug-31383-bug-29691-follow-up-Remove-getopacnewsby.patch (text/plain), 5.55 KB, created by
Jonathan Druart
on 2023-10-23 09:20:37 UTC
(
hide
)
Description:
Bug 31383: (bug 29691 follow-up) Remove get_opac_news_by_id
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2023-10-23 09:20:37 UTC
Size:
5.55 KB
patch
obsolete
>From ee37feab13b2cfd9f8f39a3740df845b29e7c517 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 23 Oct 2023 11:19:27 +0200 >Subject: [PATCH] Bug 31383: (bug 29691 follow-up) Remove get_opac_news_by_id > >We can simply use get here >--- > Koha/Template/Plugin/AdditionalContents.pm | 23 +--------- > .../bootstrap/en/modules/opac-main.tt | 2 +- > .../Template/Plugin/AdditionalContents.t | 45 +++++-------------- > 3 files changed, 14 insertions(+), 56 deletions(-) > >diff --git a/Koha/Template/Plugin/AdditionalContents.pm b/Koha/Template/Plugin/AdditionalContents.pm >index 6d25255a2e7..a44de966dc9 100644 >--- a/Koha/Template/Plugin/AdditionalContents.pm >+++ b/Koha/Template/Plugin/AdditionalContents.pm >@@ -36,13 +36,14 @@ sub get { > my $blocktitle = $params->{blocktitle}; > my $lang = $params->{lang} || 'default'; > my $library = $params->{library}; >+ my $id = $params->{id}; > > my $content = Koha::AdditionalContents->search_for_display( > { > category => $category, > location => $location, > lang => $lang, >- library_id => $library, >+ ( $library ? ( library_id => $library ) : () ), > } > ); > >@@ -56,26 +57,6 @@ sub get { > return; > } > >-sub get_opac_news_by_id { >- my ( $self, $params ) = @_; >- >- my $news_id = $params->{news_id}; >- >- my $content = Koha::AdditionalContents->search( >- { >- location => ['opac_only', 'staff_and_opac'], >- idnew => $news_id, >- category => 'news', >- } >- ); >- >- if ( $content->count ) { >- return { >- content => $content, >- }; >- } >-} >- > 1; > > =head1 NAME >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index bc541e0f9a1..e8cf85bc9d7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -89,7 +89,7 @@ > [% END %] > > [% IF news_id %] >- [% SET koha_news = AdditionalContents.get_opac_news_by_id( news_id => news_id ) %] >+ [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, news_id => news_id ) %] > [% ELSE %] > [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, library => branchcode ) %] > [% END %] >diff --git a/t/db_dependent/Template/Plugin/AdditionalContents.t b/t/db_dependent/Template/Plugin/AdditionalContents.t >index 2dce9cc4447..cf30973e1e2 100755 >--- a/t/db_dependent/Template/Plugin/AdditionalContents.t >+++ b/t/db_dependent/Template/Plugin/AdditionalContents.t >@@ -16,7 +16,7 @@ > > use Modern::Perl; > >-use Test::More tests => 2; >+use Test::More tests => 1; > > use C4::Context; > use Koha::Caches; >@@ -37,15 +37,23 @@ subtest 'get' => sub { > > my $additional_contents = Koha::Template::Plugin::AdditionalContents->get({ category => 'news', location => ['opac_only', 'staff_and_opac'], lang => 'default', library => '%' }); > my $before_count = $additional_contents ? $additional_contents->{content}->count() : 0; >- $builder->build_object({ >+ my $additional_content = $builder->build_object({ > class => 'Koha::AdditionalContents', > value => { > category => 'news', > location => 'opac_only', >- lang => 'default', > branchcode => undef > } > }); >+ $builder->build_object( >+ { >+ class => 'Koha::AdditionalContentsLocalizations', >+ value => { >+ additional_content_id => $additional_content->id, >+ lang => 'default', >+ } >+ } >+ ); > $additional_contents = Koha::Template::Plugin::AdditionalContents->get({ category => 'news', location => ['opac_only', 'staff_and_opac'], lang => 'default' }); > is( $additional_contents->{content}->count, $before_count + 1, "We get the additional one we added"); > >@@ -54,37 +62,6 @@ subtest 'get' => sub { > is( $additional_contents->{blocktitle}, 'blockhead', "Block title is passed through"); > > >-}; >- >-subtest 'get_opac_news_by_id' => sub { >- >- plan tests => 4; >- >- my $news_item = $builder->build_object({ >- class => 'Koha::AdditionalContents', >- value => { >- category => 'news', >- location => 'opac_only' >- } >- }); >- >- my $fetched_news = Koha::Template::Plugin::AdditionalContents->get_opac_news_by_id({ news_id => $news_item->id }); >- is( $fetched_news->{content}->next->content, $news_item->content, "Correct news fetched for opac location" ); >- >- $news_item->location('staff_and_opac')->store(); >- $fetched_news = Koha::Template::Plugin::AdditionalContents->get_opac_news_by_id({ news_id => $news_item->id }); >- is( $fetched_news->{content}->next->content, $news_item->content, "Correct news fetched for oac and staff location" ); >- >- $news_item->location('staff_only')->store(); >- $fetched_news = Koha::Template::Plugin::AdditionalContents->get_opac_news_by_id({ news_id => $news_item->id }); >- is( $fetched_news, 0, "News item not fetched when location is staff_only" ); >- >- $news_item->location('opac_only')->category('HtmlCustomizations')->store(); >- $fetched_news = Koha::Template::Plugin::AdditionalContents->get_opac_news_by_id({ news_id => $news_item->id }); >- is( $fetched_news, 0, "News not fetched from a different category" ); >- >- >- > }; > > $schema->storage->txn_rollback; >-- >2.34.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 31383
:
147891
|
147892
|
147893
|
147894
|
147895
|
147896
|
149813
|
149814
|
149815
|
149816
|
149817
|
149818
|
152423
|
152424
|
152425
|
152426
|
152427
|
152428
|
152545
|
152546
|
152547
|
152566
|
152660
|
152661
|
152662
|
152663
|
152664
|
152665
|
152666
|
152667
|
152668
|
152669
|
153013
|
153666
|
153667
|
153668
|
153669
|
153670
|
153671
|
153672
|
153673
|
153674
|
153675
|
153676
|
156048
|
156049
|
156050
|
156051
|
156052
|
156053
|
156054
|
156055
|
156056
|
156057
|
156058
|
156265
|
156266
|
156267
|
156268
|
156269
|
156270
|
156271
|
156272
|
156273
|
156274
|
156275
|
156276
|
157539
|
157540
|
157541
|
157542
|
157543
|
157544
|
157545
|
157546
|
157547
|
157548
|
157549
|
157550
|
157580
|
157585
| 157640 |
157741
|
157742