Bug 19074: Fix category display in Batch patron modification.

[koha.git] / tools / koha-news.pl

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index 478308f..61c3ec6 100755 (executable)
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -24,27 +24,31 @@
 
 use strict;
 # use warnings; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
 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/;
-use C4::Branch qw/GetBranches/;
+use Koha::DateUtils;
 
 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 $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 $timestamp      = output_pref({ dt => dt_from_string( scalar $cgi->param('timestamp') ), 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');
+
 # Foreign Key constraints work with NULL, not ''
 # NULL = All branches.
 $branchcode = undef if (defined($branchcode) && $branchcode eq '');
@@ -62,21 +66,24 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
+# 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->{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') // '';
@@ -96,25 +103,31 @@ if ( $op eq 'add_form' ) {
     }
 }
 elsif ( $op eq 'add' ) {
-    add_opac_new(
-        {
-            title          => $title,
-            new            => $new,
-            lang           => $lang,
-            expirationdate => $expirationdate,
-            timestamp      => $timestamp,
-            number         => $number,
-            branchcode     => $branchcode,
-        }
-    );
-    print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
+    if ($title) {
+        add_opac_new(
+            {
+                title          => $title,
+                content        => $content,
+                lang           => $lang,
+                expirationdate => $expirationdate,
+                timestamp      => $timestamp,
+                number         => $number,
+                branchcode     => $branchcode,
+                borrowernumber => $borrowernumber,
+            }
+        );
+        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,
             title          => $title,
-            new            => $new,
+            content        => $content,
             lang           => $lang,
             expirationdate => $expirationdate,
             timestamp      => $timestamp,
@@ -125,7 +138,7 @@ elsif ( $op eq 'edit' ) {
     print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
 }
 elsif ( $op eq 'del' ) {
-    my @ids = $cgi->param('ids');
+    my @ids = $cgi->multi_param('ids');
     del_opac_new( join ",", @ids );
     print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
 }
@@ -136,7 +149,6 @@ else {
     
     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;