beb74124f2
In the staff client, when you went to Home -> Tools -> News the default 'Display location' is 'All'. Everything is correctly displayed. However, if you change the filter it filters the table correctly, but does not set the dropdown value to match. This patch corrects this. TEST PLAN --------- 1) Home -> Tools -> News 2) Change 'Display location' value and click 'Filter'. - Is the 'Display location' value the same now? (no) - Are the correct values displayed? 3) Click 'New entry' - Is it anything other than 'All'? (no, and is this correct?) 4) Click 'Cancel' 5) Click 'Edit' for various news items with different locations. - Does the 'Display location' get proper set? (no) 6) Apply patch 7) Change the 'Display location' value and click 'Filter'. - Does the 'Display location' value stay the same? (this should be correct now) - Are the correct values displayed? 8) Change the 'Display location' value to 'All' and click 'Filter'. - Does everything display? 9) Change the 'Display location' value and click 'Filter'. 10) Click 'New entry' - Does it match what the filter was? (should match now) 11) Click 'Cancel' 12) Click 'Edit' for various news items with different locations. - Does the 'Display location' get proper set? (this should be correct now) Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
122 lines
3.8 KiB
Perl
Executable file
122 lines
3.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
||
|
||
# This file is part of Koha.
|
||
#
|
||
# Script to manage the opac news.
|
||
# written 11/04
|
||
# Casta<74>eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
|
||
# Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
|
||
# Copyright 2000-2002 Katipo Communications
|
||
# 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 strict;
|
||
# use warnings; FIXME - Bug 2505
|
||
use CGI;
|
||
use C4::Auth;
|
||
use C4::Koha;
|
||
use C4::Context;
|
||
use C4::Dates qw(format_date_in_iso);
|
||
use C4::Output;
|
||
use C4::NewsChannels;
|
||
use C4::Languages qw(getTranslatedLanguages);
|
||
use Date::Calc qw/Date_to_Days Today/;
|
||
|
||
my $cgi = new CGI;
|
||
|
||
my $id = $cgi->param('id');
|
||
my $title = $cgi->param('title');
|
||
my $new = $cgi->param('new');
|
||
my $expirationdate = format_date_in_iso($cgi->param('expirationdate'));
|
||
my $timestamp = format_date_in_iso($cgi->param('timestamp'));
|
||
my $number = $cgi->param('number');
|
||
my $lang = $cgi->param('lang');
|
||
|
||
my $new_detail = get_opac_new($id);
|
||
|
||
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
||
{
|
||
template_name => "tools/koha-news.tmpl",
|
||
query => $cgi,
|
||
type => "intranet",
|
||
authnotrequired => 0,
|
||
flagsrequired => { tools => 'edit_news' },
|
||
debug => 1,
|
||
}
|
||
);
|
||
|
||
# get lang list
|
||
my @lang_list;
|
||
my $tlangs = getTranslatedLanguages() ;
|
||
foreach my $language ( @$tlangs ) {
|
||
push @lang_list,
|
||
{
|
||
language => $language->{'rfc4646_subtag'},
|
||
selected => ( $new_detail->{lang} eq $language->{'rfc4646_subtag'} ? 1 : 0 ),
|
||
};
|
||
}
|
||
|
||
$template->param( lang_list => \@lang_list );
|
||
|
||
my $op = $cgi->param('op');
|
||
|
||
if ( $op eq 'add_form' ) {
|
||
$template->param( add_form => 1 );
|
||
if ($id) {
|
||
if($new_detail->{lang} eq "slip"){ $template->param( slip => 1); }
|
||
$template->param(
|
||
op => 'edit',
|
||
id => $new_detail->{'idnew'}
|
||
);
|
||
$template->{VARS}->{'new_detail'} = $new_detail;
|
||
}
|
||
else {
|
||
$template->param( op => 'add' );
|
||
}
|
||
}
|
||
elsif ( $op eq 'add' ) {
|
||
add_opac_new( $title, $new, $lang, $expirationdate, $timestamp, $number );
|
||
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
|
||
}
|
||
elsif ( $op eq 'edit' ) {
|
||
upd_opac_new( $id, $title, $new, $lang, $expirationdate, $timestamp ,$number );
|
||
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
|
||
}
|
||
elsif ( $op eq 'del' ) {
|
||
my @ids = $cgi->param('ids');
|
||
del_opac_new( join ",", @ids );
|
||
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
|
||
}
|
||
|
||
else {
|
||
|
||
my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang );
|
||
|
||
foreach my $new ( @$opac_news ) {
|
||
next unless $new->{'expirationdate'};
|
||
#$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'});
|
||
my @date = split (/-/,$new->{'expirationdate'});
|
||
if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){
|
||
$new->{'expired'} = 1;
|
||
}
|
||
}
|
||
|
||
$template->param(
|
||
opac_news => $opac_news,
|
||
opac_news_count => $opac_news_count,
|
||
);
|
||
}
|
||
$template->param( lang => $lang );
|
||
output_html_with_http_headers $cgi, $cookie, $template->output;
|