Bugzilla – Attachment 139348 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: (follow-up) Same change at intranet side
Bug-31385-follow-up-Same-change-at-intranet-side.patch (text/plain), 1.80 KB, created by
Marcel de Rooy
on 2022-08-18 08:47:53 UTC
(
hide
)
Description:
Bug 31385: (follow-up) Same change at intranet side
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2022-08-18 08:47:53 UTC
Size:
1.80 KB
patch
obsolete
>From 3fea8b17fc1d6a9c264355da24606660d3801a2f Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 18 Aug 2022 07:29:35 +0000 >Subject: [PATCH] Bug 31385: (follow-up) Same change at intranet side >Content-Type: text/plain; charset=utf-8 > >Test plan: >Try at staff side: tools/page.pl?code=CODE > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > tools/page.pl | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > >diff --git a/tools/page.pl b/tools/page.pl >index 0cec1e7da3..b504bdb6f8 100755 >--- a/tools/page.pl >+++ b/tools/page.pl >@@ -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; >-- >2.20.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 31385
:
139295
|
139296
|
139298
|
139348
|
139349
|
139390
|
139391
|
139392
|
139393