# 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 Modern::Perl;
+use CGI qw ( -utf8 );
+use C4::Auth qw( get_template_and_user );
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/;
-use C4::Branch qw/GetBranches/;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Languages qw( getTranslatedLanguages );
+use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::News;
-my $cgi = new CGI;
+my $cgi = CGI->new;
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 $content = $cgi->param('content');
+my $expirationdate;
+if ( $cgi->param('expirationdate') ) {
+ $expirationdate = output_pref({ dt => dt_from_string( scalar $cgi->param('expirationdate') ), dateformat => 'iso', dateonly => 1 });
+}
+my $published_on= output_pref({ dt => dt_from_string( scalar $cgi->param('published_on') ), dateformat => 'iso', dateonly => 1 });
my $number = $cgi->param('number');
my $lang = $cgi->param('lang');
my $branchcode = $cgi->param('branch');
+my $error_message = $cgi->param('error_message');
+my $wysiwyg;
+if( $cgi->param('editmode') ){
+ $wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
+} else {
+ $wysiwyg = C4::Context->preference("NewsToolEditor") eq "tinymce" ? 1 : 0;
+}
+
# Foreign Key constraints work with NULL, not ''
# NULL = All branches.
$branchcode = undef if (defined($branchcode) && $branchcode eq '');
-my $new_detail = get_opac_new($id);
+my $new_detail = Koha::News->find( $id );
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "tools/koha-news.tmpl",
+ template_name => "tools/koha-news.tt",
query => $cgi,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { tools => 'edit_news' },
- debug => 1,
}
);
+# Pass error message if there is one.
+$template->param( error_message => $error_message ) if $error_message;
+
# 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 ),
- };
+ foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
+ push @lang_list,
+ {
+ language => $sublanguage->{'rfc4646_subtag'},
+ selected => ( $new_detail && $new_detail->lang eq $sublanguage->{'rfc4646_subtag'} ? 1 : 0 ),
+ };
+ }
}
-my $branches = GetBranches;
-
$template->param( lang_list => \@lang_list,
- branch_list => $branches,
branchcode => $branchcode );
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); }
+ if($new_detail->lang eq "slip"){ $template->param( slip => 1); }
$template->param(
op => 'edit',
- id => $new_detail->{'idnew'}
+ id => $new_detail->idnew
);
$template->{VARS}->{'new_detail'} = $new_detail;
}
}
}
elsif ( $op eq 'add' ) {
- add_opac_new(
- {
+ if ($title) {
+ my $new = Koha::NewsItem->new({
title => $title,
- new => $new,
+ content => $content,
lang => $lang,
expirationdate => $expirationdate,
- timestamp => $timestamp,
+ published_on => $published_on,
number => $number,
branchcode => $branchcode,
- }
- );
- print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
+ borrowernumber => $borrowernumber,
+ })->store;
+ print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
+ }
+ else {
+ print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl?error_message=title_missing");
+ }
}
elsif ( $op eq 'edit' ) {
- upd_opac_new(
- {
- idnew => $id,
+ my $news_item = Koha::News->find( $id );
+ if ( $news_item ) {
+ $news_item->set({
title => $title,
- new => $new,
+ content => $content,
lang => $lang,
expirationdate => $expirationdate,
- timestamp => $timestamp,
+ published_on=> $published_on,
number => $number,
branchcode => $branchcode,
- }
- );
+ })->store;
+ }
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
elsif ( $op eq 'del' ) {
- my @ids = $cgi->param('ids');
- del_opac_new( join ",", @ids );
+ my @ids = $cgi->multi_param('ids');
+ Koha::News->search({ idnew => @ids })->delete;
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
else {
-
- my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang, $branchcode );
-
- 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;
+ my $params;
+ $params->{lang} = $lang if $lang;
+ my $opac_news = Koha::News->search(
+ $params,
+ {
+ order_by => { -desc => 'published_on' },
}
- }
-
- $template->param(
- opac_news => $opac_news,
- opac_news_count => $opac_news_count,
- );
+ );
+ $template->param( opac_news => $opac_news );
}
-$template->param( lang => $lang );
+$template->param(
+ lang => $lang,
+ wysiwyg => $wysiwyg,
+);
output_html_with_http_headers $cgi, $cookie, $template->output;
projects / srvgit / blobdiff