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

Bug 31385: (follow-up) Same change at intranet side 

Test plan:
Try at staff side: tools/page.pl?code=CODE

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Marcel de Rooy 2022-08-18 07:29:35 +00:00 committed by Tomas Cohen Arazi
parent 136c752ab1
commit f72b721858
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/page.pl
View File

@ -32,17 +32,18 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
my $branch = C4::Context->userenv->{'branch'};
my $page_id = $query->param('page_id');
my $code = $query->param('code');
my $page;
if (defined $page_id){
my $branch = C4::Context->userenv->{'branch'};
if( $page_id ) {
$page = Koha::AdditionalContents->search({ idnew => $page_id, location => ['staff_only', 'staff_and_opac'], branchcode => [ $branch, 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 => ['staff_only', 'staff_and_opac'], branchcode => [ $branch, 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;