From a5b1b4e836e65789ca6d8d579438b582cef3ea52 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 17 Aug 2022 13:41:53 +0000 Subject: [PATCH] Bug 31385: Allow searching a CMS page by code Content-Type: text/plain; charset=utf-8 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 --- 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.20.1