diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt index c693a68b2e..21dd0eeb04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -366,16 +366,22 @@
[% END %] - + + + [% ELSE %] [% END %] @@ -482,15 +488,19 @@ "sPaginationType": "full_numbers" })); - $(".delete_news").on("click", function(){ - return confirmDelete( _("Are you sure you want to delete this news item? This cannot be undone.") ); + $("#del_form").on("click", ".delete_news", function(e){ + e.preventDefault(); + if( confirmDelete( _("Are you sure you want to delete this content? This cannot be undone.") ) ){ + $("#del_ids").val( $(this).data("idnew") ); + $("#delete_single").submit(); + } }); $("#del_form").on("submit",function(){ if ( Checkbox() ) { - return confirmDelete( _("Are you sure you want to delete the selected news?") ); + return confirmDelete( _("Are you sure you want to delete the selected content?") ); } else { - alert(_("Please select a news item to delete.")); + alert(_("Please select content to delete.")); return false; } }); diff --git a/tools/additional-contents.pl b/tools/additional-contents.pl index e4a409cb68..288c6e1ab7 100755 --- a/tools/additional-contents.pl +++ b/tools/additional-contents.pl @@ -174,7 +174,7 @@ elsif ( $op eq 'add_validate' ) { elsif ( $op eq 'delete_confirmed' ) { my @ids = $cgi->multi_param('ids'); my $deleted = - eval { Koha::AdditionalContents->search( { idnew => @ids } )->delete; }; + map { Koha::AdditionalContents->find($_)->delete() } @ids; if ( $@ or not $deleted ) { push @messages, { type => 'error', code => 'error_on_delete' };