View | Details | Raw Unified | Return to bug 29019
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-6 / +16 lines)
Lines 366-381 Link Here
366
                                </ul>
366
                                </ul>
367
                            </div>
367
                            </div>
368
                            <div class="btn-group">
368
                            <div class="btn-group">
369
                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=del&amp;ids=[% c.idnew | uri %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
369
                                <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a>
370
                            </div>
370
                            </div>
371
                        </td>
371
                        </td>
372
                    </tr>
372
                    </tr>
373
                    [% END %]
373
                    [% END %]
374
                </tbody>
374
                </tbody>
375
            </table>
375
            </table>
376
            <input type="hidden" name="op" value="del" />
376
            <input type="hidden" name="op" value="delete_confirmed" />
377
            <input type="hidden" name="category" value="[% category | html %]" />
377
            <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>
378
            <fieldset class="action"><input type="submit" class="button" value="Delete selected" /></fieldset>
378
        </form>
379
        </form>
380
        <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
381
            <input type="hidden" id="del_op" name="op" value="delete_confirmed" />
382
            <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
383
            <input type="hidden" id="del_ids" name="ids" />
384
        </form>
379
    [% ELSE %]
385
    [% ELSE %]
380
        <div class="dialog message">There are no additional contents.</div>
386
        <div class="dialog message">There are no additional contents.</div>
381
    [% END %]
387
    [% END %]
Lines 482-496 Link Here
482
                    "sPaginationType": "full_numbers"
488
                    "sPaginationType": "full_numbers"
483
                }));
489
                }));
484
490
485
                $(".delete_news").on("click", function(){
491
                $("#del_form").on("click", ".delete_news", function(e){
486
                    return confirmDelete( _("Are you sure you want to delete this news item? This cannot be undone.") );
492
                    e.preventDefault();
493
                    if( confirmDelete( _("Are you sure you want to delete this content? This cannot be undone.") ) ){
494
                        $("#del_ids").val( $(this).data("idnew") );
495
                        $("#delete_single").submit();
496
                    }
487
                });
497
                });
488
498
489
                $("#del_form").on("submit",function(){
499
                $("#del_form").on("submit",function(){
490
                    if ( Checkbox() ) {
500
                    if ( Checkbox() ) {
491
                        return confirmDelete( _("Are you sure you want to delete the selected news?") );
501
                        return confirmDelete( _("Are you sure you want to delete the selected content?") );
492
                    } else {
502
                    } else {
493
                        alert(_("Please select a news item to delete."));
503
                        alert(_("Please select content to delete."));
494
                        return false;
504
                        return false;
495
                    }
505
                    }
496
                });
506
                });
(-)a/tools/additional-contents.pl (-2 / +1 lines)
Lines 174-180 elsif ( $op eq 'add_validate' ) { Link Here
174
elsif ( $op eq 'delete_confirmed' ) {
174
elsif ( $op eq 'delete_confirmed' ) {
175
    my @ids = $cgi->multi_param('ids');
175
    my @ids = $cgi->multi_param('ids');
176
    my $deleted =
176
    my $deleted =
177
      eval { Koha::AdditionalContents->search( { idnew => @ids } )->delete; };
177
        map { Koha::AdditionalContents->find($_)->delete() } @ids;
178
178
179
    if ( $@ or not $deleted ) {
179
    if ( $@ or not $deleted ) {
180
        push @messages, { type => 'error', code => 'error_on_delete' };
180
        push @messages, { type => 'error', code => 'error_on_delete' };
181
- 

Return to bug 29019