c6ea593971
Test plan:
1) Add more than one library, at least two in total is needed. Make note
of which is your current user's home branch.
2) Go to Tools -> News and add one global ("All") news item and one
specific for each branch.
3) Apply the patches.
4) Perform database upgrades when you log in.
5) Go to OPAC main, it should work as before: Showing global news as
well as the news for your home branch once logged in.
6) Go to System Preferences -> OPAC and set 'OPACNewsBranchSelect' to
yes.
7) Go to OPAC main, you should see the global news item plus any items
for your home branch for the current user if logged in.
8) Above the news, you will see a dropdown that lists the branches.
Select one, and click "Change library."
9) You should now see global news and the news for the selected branch,
regardless of whether logged in or not.
Sponsored-By: Halland County Library
Fixes QA comments:
* Keep the current selected branch selected
* Change OPACNewsBranchSelect -> OPACNewsLibrarySelect
* fix 'system wide only' view for logged in user. We still show system
wide even when a library is selected.
* Removed the "change library" link
* Added a label to the field.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Zeno Tajoli <z.tajoli@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
82 lines
2.8 KiB
Perl
Executable file
82 lines
2.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Parts Copyright (C) 2013 Mark Tompsett
|
|
#
|
|
# 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; # get_template_and_user
|
|
use C4::Output;
|
|
use C4::NewsChannels; # GetNewsToDisplay
|
|
use C4::Languages qw(getTranslatedLanguages accept_language);
|
|
use C4::Koha qw( GetDailyQuote );
|
|
|
|
my $input = new CGI;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-main.tt",
|
|
type => "opac",
|
|
query => $input,
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
}
|
|
);
|
|
|
|
my $casAuthentication = C4::Context->preference('casAuthentication');
|
|
$template->param(
|
|
casAuthentication => $casAuthentication,
|
|
);
|
|
|
|
# display news
|
|
# use cookie setting for language, bug default to syspref if it's not set
|
|
my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-main.tt','opac',$input);
|
|
|
|
my $homebranch;
|
|
if (C4::Context->userenv) {
|
|
$homebranch = C4::Context->userenv->{'branch'};
|
|
}
|
|
if (defined $input->param('branch') and length $input->param('branch')) {
|
|
$homebranch = $input->param('branch');
|
|
}
|
|
if (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){
|
|
$homebranch = "";
|
|
}
|
|
my $all_koha_news = &GetNewsToDisplay($news_lang,$homebranch);
|
|
my $koha_news_count = scalar @$all_koha_news;
|
|
|
|
my $quote = GetDailyQuote(); # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
|
|
|
|
$template->param(
|
|
koha_news => $all_koha_news,
|
|
koha_news_count => $koha_news_count,
|
|
branchcode => $homebranch,
|
|
display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
|
|
daily_quote => $quote,
|
|
);
|
|
|
|
# If GoogleIndicTransliteration system preference is On Set parameter to load Google's javascript in OPAC search screens
|
|
if (C4::Context->preference('GoogleIndicTransliteration')) {
|
|
$template->param('GoogleIndicTransliteration' => 1);
|
|
}
|
|
|
|
if (C4::Context->preference('OPACNumbersPreferPhrase')) {
|
|
$template->param('numbersphr' => 1);
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|