Bugzilla – Attachment 139296 Details for
Bug 31385
Additional contents: Allow searching a CMS page by code in multilanguage env
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31385: Allow searching a CMS page by code
Bug-31385-Allow-searching-a-CMS-page-by-code.patch (text/plain), 2.26 KB, created by
Kyle M Hall (khall)
on 2022-08-17 14:37:47 UTC
(
hide
)
Description:
Bug 31385: Allow searching a CMS page by code
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2022-08-17 14:37:47 UTC
Size:
2.26 KB
patch
obsolete
>From 1e586bc31e764496baf5f4e7979a998e71b2ab95 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 17 Aug 2022 13:41:53 +0000 >Subject: [PATCH] Bug 31385: Allow searching a CMS page by code > >Test plan: >Add a CMS page with two languages for it. >Look at the code column in the DB. >Try opac/opac-page.pl?code=[CODE]&lang=[LANG]. Test leaving lang >empty and passing various languages. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > opac/opac-page.pl | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > >diff --git a/opac/opac-page.pl b/opac/opac-page.pl >index 7a4737df87..7fe0d88582 100755 >--- a/opac/opac-page.pl >+++ b/opac/opac-page.pl >@@ -19,6 +19,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Auth qw( get_template_and_user ); >+use C4::Languages qw(getlanguage); > use C4::Output qw( output_html_with_http_headers ); > use Koha::AdditionalContents; > >@@ -34,6 +35,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > ); > > my $page_id = $query->param('page_id'); >+my $code = $query->param('code'); > my $page; > > my $homebranch = $ENV{OPAC_BRANCH_DEFAULT}; >@@ -41,13 +43,13 @@ if (C4::Context->userenv) { > $homebranch = C4::Context->userenv->{'branch'}; > } > >-if (defined $page_id){ >+if( $page_id ) { > $page = Koha::AdditionalContents->search({ idnew => $page_id, location => ['opac_only', 'staff_and_opac'], branchcode => [ $homebranch, undef ] }); >- if ( $page->count > 0){ >- $template->param( page => $page->next ); >- } else { >- $template->param( page_error => 1 ); >- } >+} elsif( $code ) { >+ my $lang = $query->param('lang') || C4::Languages::getlanguage($query); # URL param overrides getlanguage >+ # In the next query we make sure that the 'default' records come after the regular languages >+ $page = Koha::AdditionalContents->search({ code => $code, lang => ['default', $lang], location => ['opac_only', 'staff_and_opac'], branchcode => [ $homebranch, undef ] }, { order_by => { -desc => \[ 'CASE WHEN lang="default" THEN "" ELSE lang END' ]}} ); > } >+$template->param( $page && $page->count ? ( page => $page->next ) : ( page_error => 1 ) ); > > output_html_with_http_headers $query, $cookie, $template->output; >-- >2.30.2
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 31385
:
139295
|
139296
|
139298
|
139348
|
139349
|
139390
|
139391
|
139392
|
139393