Merge branch 'bug_8931' into 3.12-master

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

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index 3730c10..afc5268 100755 (executable)
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -17,11 +17,12 @@
 # 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, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -38,6 +39,7 @@ 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');
 
@@ -72,22 +74,23 @@ 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->param($new_detail);
+        $template->{VARS}->{'new_detail'} = $new_detail;
     }
     else {
         $template->param( op => 'add' );
     }
 }
 elsif ( $op eq 'add' ) {
-    add_opac_new( $title, $new, $lang, $expirationdate, $number );
+    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, $number );
+    upd_opac_new( $id, $title, $new, $lang, $expirationdate, $timestamp ,$number );
     print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
 }
 elsif ( $op eq 'del' ) {