Brieffunktion: Löschen von Entwürfen gefixt

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index e9fe6cf7567c0710a941d7313b2dd52f37795a8f..bdef557bbf9091d7fc2e79ec4003b3524c2c033e 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -308,7 +308,10 @@ sub action_skip_draft {
 
 sub action_delete_drafts {
   my ($self) = @_;
 
 sub action_delete_drafts {
   my ($self) = @_;

-  delete_letter_drafts();
+
+  my @ids = @{ $::form->{ids} || [] };
+  SL::DB::Manager::LetterDraft->delete_all(where => [ id => \@ids ]) if @ids;
+

   $self->action_add(skip_drafts => 1);
 }
 
   $self->action_add(skip_drafts => 1);
 }
 

diff --git a/templates/webpages/letter/load_drafts.html b/templates/webpages/letter/load_drafts.html
index 33cc9469e1a5e6bd61f175bb13063d89feb879c5..f2455ecd4d8586f03c4708d89d9bf8955e28a54f 100644 (file)
--- a/templates/webpages/letter/load_drafts.html
+++ b/templates/webpages/letter/load_drafts.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]

-[%- USE HTML %]
+[%- USE HTML %][%- USE L -%]

 <h1>[% 'Load letter draft' | $T8 %]</h1>
 
  <form method="post" name="Form" action="controller.pl">
 <h1>[% 'Load letter draft' | $T8 %]</h1>
 
  <form method="post" name="Form" action="controller.pl">


@@ -19,7 +19,7 @@
 
       [% FOREACH row = LETTER_DRAFTS %]
        <tr class="listrow[% loop.count % 2 %]">
 
       [% FOREACH row = LETTER_DRAFTS %]
        <tr class="listrow[% loop.count % 2 %]">

-        <td><input type="checkbox" name="checked_[% row.id %]" value="1"></td>
+        <td>[% L.checkbox_tag("ids[+]", value=row.id) %]</td>

         <td>[% row.date.to_kivitendo | html %]</td>
         <td><a href="[% SELF.url_for(action='edit', 'draft.id'=row.id) %]">[% row.subject | html %]</a></td>
         <td>[% row.customer.displayable_name | html %]</td>
         <td>[% row.date.to_kivitendo | html %]</td>
         <td><a href="[% SELF.url_for(action='edit', 'draft.id'=row.id) %]">[% row.subject | html %]</a></td>
         <td>[% row.customer.displayable_name | html %]</td>


@@ -32,7 +32,7 @@
     <td>
      <input type="hidden" name="action" value="Letter/dispatch">
      <input type="submit" class="submit" name="action_skip_draft" value="[% 'Skip' | $T8 %]">
     <td>
      <input type="hidden" name="action" value="Letter/dispatch">
      <input type="submit" class="submit" name="action_skip_draft" value="[% 'Skip' | $T8 %]">

-     <input type="submit" class="submit" name="action_delete_draft" value="[% 'Delete drafts' | $T8 %]">
+     <input type="submit" class="submit" name="action_delete_drafts" value="[% 'Delete drafts' | $T8 %]">

    </td>
    </tr>
   </table>
    </td>
    </tr>
   </table>