gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: I squashed the lang => language patch
This commit is contained in:
Marcel de Rooy 2022-08-17 13:41:53 +00:00 committed by Tomas Cohen Arazi
parent 0b9a82541b
commit 136c752ab1
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opac/opac-page.pl
View File

@ -34,6 +34,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 +42,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('language') || $query->cookie('KohaOpacLanguage');
# 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;