Jonathan Druart
f5ac2916f2
In the design of additional contents the idea of a parent-child relation is implicitly present. You have a default page and translations. But we do this in one table coming from the old news items. Several reports show that we would be better off creating a parent table listing the main news items, CMS pages or HTML content. And a child table containing the title, content and lang. Note that this first step is a prelimenary step to clean this area and make it more robust and extensible. More enhancements to come. What is this patchset doing? * DB changes - Rename additional_contents.idnew with id - Create a new table additional_contents_localizations(id, additional_content_id, title, content, lang) that will contain the translated contents - Move the content to this new table - Remove title, content and lang columns from additional_contents - Replace the notice templates that are using ''<news>" (should only be ISSUESLIP) and remove support for this syntax. Also add a warning in case other occurrences of uses of the old syntax exist. * CRUD - We add a new Koha::AdditionalContentsLocalization[s] couple, and move some logic from Koha::AdditionalContent[s] to there. Note that, to prevent too much drastic changes in notice templates, and to make them easy to use, the different attributes of the content object is accessible from the translated content object (ie. Koha::AdditionalContentsLocatlization->library is available and return $self->additional_content->library). I think it's an elegant way to keep things simple. - No changes expected for "NewsLog" logging - Little behaviour changes for pages, see tools/page.pl changes. We are now passing the id of the content, and the desired language, instead of the mix of "page_id" or code and lang. Note that here we certainly need to rename "language" query param to not change the full interface language. Test plan: 0. Preparation steps, use master a. Create notice templates that are using "<< additional_contents.code >>". This won't be replaced, but we want the update process to alert us. b. Create several news, additional contents, pages. Some with translated contents, some without. c. Make sure ISSUESLIP has the "<news>" section. If you are using the sample data there is nothing to do here d. Turn on NewsLogs 1. Apply the patches, restart_all, updatedatabase => Confirm that the new table is created and filled with the contents you had prior to the update => Confirm that additional_contents_localizations.updated_on has been kept to the previous values => Confirm that ISSUESLIP has been replaced properly => Confirm that you get a warning about the additional_contents 2. Create, update, delete news, html customs, pages => Confirm that the additional_contents_localizations.updated_on is only adjusted when required => Confirm that the logs are correctly created when NewsLogs is on 3. Check some items out, generate a slip => Confirm that the news are displayed at the bottom of the slip, and that the publication date is correctly formatted 4. Have several HTML customizations (like OpacNav, opacheader), in translated in different languages => Confirm that the default values is displayed when you are using the interface in a language without translation => Confirm that the translated version is picked when it exists Notes for QA: * I am not sure we really need the alert during the update DB process about the additional_contents leftover. We should not have them outside of ISSUESLIP. Shouldn't it hurt? * There is something ugly in sample_news.yml, the id is hardcoded. But how do we prevent that and keep translatability? Sponsored-by: Rijksmuseum, Netherlands Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
56 lines
1.8 KiB
Perl
Executable file
56 lines
1.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Output qw( output_html_with_http_headers );
|
|
use C4::Languages qw( getlanguage );
|
|
use Koha::AdditionalContents;
|
|
|
|
my $query = CGI->new();
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-page.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
}
|
|
);
|
|
|
|
my $page_id = $query->param('page_id');
|
|
my $lang = $query->param('language');
|
|
|
|
my $homebranch = $ENV{OPAC_BRANCH_DEFAULT};
|
|
if (C4::Context->userenv) {
|
|
$homebranch = C4::Context->userenv->{'branch'};
|
|
}
|
|
|
|
my $page = Koha::AdditionalContents->find($page_id);
|
|
|
|
if ( !$page || $page->category ne 'pages' || $page->branchcode && $page->branchcode != $homebranch || $page->location ne 'opac_only' && $page->location ne 'staff_and_opac' ) {
|
|
print $query->redirect('/cgi-bin/koha/errors/404.pl');
|
|
exit;
|
|
}
|
|
|
|
my $content = $page->translated_content( $lang || C4::Languages::getlanguage($query) );
|
|
|
|
$template->param( page => $content );
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|