53f15f678f
This adds the ability to specify whether staff, OPAC,
or slip news entries apply to all libraries or just a
particular library.
With the branch parameter added to key functions in
C4/NewsChannels.pm, function calls in C4/Members.pm,
mainpage.pl, opac/opac-main.pl, tools/koha-news.pl, and
t/db_dependent/NewsChannels.t were needed.
Some license texts were updated.
Templates were modified to display, allow for entry and editing
of the branches selected.
TEST PLAN
---------
1) Having logged into the staff client, is the news displaying
correctly? Have you entered a news item which should not
display for this branch of logged in user?
2) Find a patron (with some items checked out?)
3) Print a slip
- News which is labelled 'All Branches' or for the same branch
as the one printing the slip should display on the slip.
- THIS DOES NOT AFFECT QUICK SLIPS
4) Home -> Tools -> News
- Can you edit a news item?
- Does the change save correctly?
- Can you filter based on location and branch correctly?
- Can you add a new entry correctly?
- Can you delete an entry correctly?
5) Open an OPAC client.
- Does only the news for all branches display?
6) Log into the OPAC client.
- Does the news for all branches and the specific branch display?
7) prove -v t/db_dependent/NewsChannels.t
- Does it run and all succeed?
- Does the code seem to catch the required cases?
8) Comparing the patched and unpatched versions of files affected,
are the license changes missing anything?
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
83 lines
2.4 KiB
Perl
Executable file
83 lines
2.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Copyright Paul Poulain 2002
|
|
# Parts Copyright Liblime 2007
|
|
# 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;
|
|
use C4::Output;
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::NewsChannels; # GetNewsToDisplay
|
|
use C4::Review qw/numberofreviews/;
|
|
use C4::Suggestions qw/CountSuggestion/;
|
|
use C4::Tags qw/get_count_by_tag_status/;
|
|
use Koha::Borrower::Modifications;
|
|
|
|
my $query = new CGI;
|
|
|
|
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
|
|
{
|
|
template_name => "intranet-main.tmpl",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1, },
|
|
}
|
|
);
|
|
|
|
my $homebranch;
|
|
if (C4::Context->userenv) {
|
|
$homebranch = C4::Context->userenv->{'branch'};
|
|
}
|
|
my $all_koha_news = &GetNewsToDisplay("koha",$homebranch);
|
|
my $koha_news_count = scalar @$all_koha_news;
|
|
|
|
$template->param(
|
|
koha_news => $all_koha_news,
|
|
koha_news_count => $koha_news_count
|
|
);
|
|
|
|
my $branch =
|
|
C4::Context->preference("IndependentBranches")
|
|
&& !$flags->{'superlibrarian'}
|
|
? C4::Context->userenv()->{'branch'}
|
|
: undef;
|
|
|
|
my $pendingcomments = numberofreviews(0);
|
|
my $pendingtags = get_count_by_tag_status(0);
|
|
my $pendingsuggestions = CountSuggestion("ASKED");
|
|
my $pending_borrower_modifications =
|
|
Koha::Borrower::Modifications->GetPendingModificationsCount( $branch );
|
|
|
|
$template->param(
|
|
pendingcomments => $pendingcomments,
|
|
pendingtags => $pendingtags,
|
|
pendingsuggestions => $pendingsuggestions,
|
|
pending_borrower_modifications => $pending_borrower_modifications,
|
|
);
|
|
|
|
#
|
|
# warn user if he is using mysql/admin login
|
|
#
|
|
unless ($loggedinuser) {
|
|
$template->param(adminWarning => 1);
|
|
}
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|