@@ -, +, @@ - The patch now works with new "Additional contents" system - The database update follows new skeleton.pl - Add "OpacNav" option to the additional contents template --- .../bug_24223-move-opacnav-to-news.perl | 30 ------------ .../bug_24223-move-opacnav-to-news.pl | 49 +++++++++++++++++++ .../en/modules/tools/additional-contents.tt | 2 +- .../bootstrap/en/includes/masthead-sci.inc | 6 +-- .../bootstrap/en/includes/masthead-sco.inc | 2 +- .../bootstrap/en/includes/masthead.inc | 4 +- .../bootstrap/en/modules/errors/errorpage.tt | 4 +- .../opac-tmpl/bootstrap/en/modules/ilsdi.tt | 2 +- .../bootstrap/en/modules/maintenance.tt | 2 +- .../en/modules/opac-account-pay-error.tt | 4 +- .../bootstrap/en/modules/opac-account.tt | 4 +- .../en/modules/opac-auth-MARCdetail.tt | 4 +- .../bootstrap/en/modules/opac-auth-detail.tt | 4 +- .../en/modules/opac-authorities-home.tt | 4 +- .../opac-authoritiessearchresultlist.tt | 4 +- .../bootstrap/en/modules/opac-browse.tt | 4 +- .../bootstrap/en/modules/opac-browser.tt | 4 +- .../bootstrap/en/modules/opac-discharge.tt | 4 +- .../en/modules/opac-downloadshelf.tt | 4 +- .../en/modules/opac-full-serial-issues.tt | 4 +- .../bootstrap/en/modules/opac-illrequests.tt | 4 +- .../bootstrap/en/modules/opac-imageviewer.tt | 4 +- .../bootstrap/en/modules/opac-issue-note.tt | 4 +- .../bootstrap/en/modules/opac-library.tt | 4 +- .../bootstrap/en/modules/opac-main.tt | 2 +- .../opac-memberentry-update-submitted.tt | 4 +- .../bootstrap/en/modules/opac-memberentry.tt | 4 +- .../bootstrap/en/modules/opac-messaging.tt | 4 +- .../en/modules/opac-overdrive-search.tt | 4 +- .../bootstrap/en/modules/opac-passwd.tt | 4 +- .../en/modules/opac-password-recovery.tt | 4 +- .../en/modules/opac-patron-consent.tt | 4 +- .../bootstrap/en/modules/opac-privacy.tt | 4 +- .../en/modules/opac-readingrecord.tt | 4 +- .../en/modules/opac-recordedbooks-search.tt | 4 +- .../modules/opac-registration-confirmation.tt | 2 +- .../modules/opac-registration-email-sent.tt | 4 +- .../en/modules/opac-registration-invalid.tt | 4 +- .../en/modules/opac-reportproblem.tt | 4 +- .../en/modules/opac-request-article.tt | 2 +- .../en/modules/opac-restrictedpage.tt | 4 +- .../en/modules/opac-routing-lists.tt | 4 +- .../en/modules/opac-search-history.tt | 4 +- .../en/modules/opac-serial-issues.tt | 4 +- .../bootstrap/en/modules/opac-shareshelf.tt | 4 +- .../bootstrap/en/modules/opac-shelves.tt | 4 +- .../bootstrap/en/modules/opac-showreviews.tt | 4 +- .../bootstrap/en/modules/opac-suggestions.tt | 4 +- .../bootstrap/en/modules/opac-tags.tt | 4 +- .../bootstrap/en/modules/opac-tags_subject.tt | 4 +- .../bootstrap/en/modules/opac-topissues.tt | 4 +- .../bootstrap/en/modules/svc/suggestion.tt | 4 +- 52 files changed, 141 insertions(+), 126 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl create mode 100755 installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl --- a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl +++ a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.perl @@ -1,30 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - # get list of installed translations - require C4::Languages; - my @langs; - my $tlangs = C4::Languages::getTranslatedLanguages(); - - foreach my $language ( @$tlangs ) { - foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) { - push @langs, $sublanguage->{'rfc4646_subtag'}; - } - } - - # Get any existing value from the OpacNav system preference - my ($opacnav) = $dbh->selectrow_array( q| - SELECT value FROM systempreferences WHERE variable='OpacNav'; - |); - if( $opacnav ){ - foreach my $lang ( @langs ) { - print "Inserting OpacNav contents into $lang news item...\n"; - # If there is a value in the OpacNav preference, insert it into opac_news - $dbh->do("INSERT INTO opac_news (branchcode, lang, title, content, published_on ) VALUES (NULL, ?, '', ?, CAST(NOW() AS date))", undef, "OpacNav_$lang", $opacnav); - } - } - # Remove the OpacNav system preference - $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'"); - SetVersion ($DBversion); - print "Upgrade to $DBversion done (Bug 24223: Convert OpacNav system preference to news block)\n"; -} --- a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl +++ a/installer/data/mysql/atomicupdate/bug_24223-move-opacnav-to-news.pl @@ -0,0 +1,49 @@ +use Modern::Perl; + +{ + bug_number => "24223", + description => "Move contents of OpacNav system preference into additional contents", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + + # get list of installed translations + require C4::Languages; + my @langs; + my $tlangs = C4::Languages::getTranslatedLanguages(); + + foreach my $language ( @$tlangs ) { + foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) { + push @langs, $sublanguage->{'rfc4646_subtag'}; + } + } + + # There must be a "default" entry in addition to language-specific ones + push @langs, "default"; + + # Get any existing value from the OpacNav system preference + my ($opacnav) = $dbh->selectrow_array( q| + SELECT value FROM systempreferences WHERE variable='OpacNav'; + |); + if( $opacnav ){ + # If there is a value in the OpacNav preference, insert it into additional_contents + my $code = ''; + foreach my $lang ( @langs ) { + say $out "Inserting OpacNav contents into $lang news item..."; + $dbh->do( "INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', '', 'OpacNav', NULL, ?, ?, ?, CAST(NOW() AS date) )", undef, "OpacNav $lang", $opacnav, $lang ); + my $idnew = $dbh->last_insert_id(undef, undef, 'additional_contents', undef); + if( $code eq '' ){ + $code = "News_$idnew"; + } + $dbh->do(q|UPDATE additional_contents SET code=? WHERE idnew = ?|, undef, $code, $idnew); + } + + # Remove the OpacNav system preference + $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNav'"); + say $out "Bug 24223 update done"; + } else { + say $out "No OpacNav preference found. Update has already been run."; + } + + }, +} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -421,7 +421,7 @@ [% END %] [% ELSE %] - [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %] + [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %] [% IF l == location %] [% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc @@ -3,11 +3,7 @@ [% USE AdditionalContents %] [% PROCESS 'html_helpers.inc' %] [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] -<<<<<<< HEAD -[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] -======= -[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] ->>>>>>> Bug 24223: (follow-up) Make logged-in user's branchcode available to template +[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]