X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdrafts.pl;h=1aa34a56ffa6b7d026d12a6757f30db9e9b1d907;hb=44e1ec6fcc2422cb75d36578245e16a33acef2d8;hp=c10d91afe32871c1262dc807b7449b3ea13c48c9;hpb=08df38dfcaad6fef28988003da9212ef47f75c84;p=kivitendo-erp.git

diff --git a/bin/mozilla/drafts.pl b/bin/mozilla/drafts.pl
index c10d91afe..1aa34a56f 100644
--- a/bin/mozilla/drafts.pl
+++ b/bin/mozilla/drafts.pl
@@ -7,6 +7,8 @@
 #
 #======================================================================
 
+use YAML;
+
 use SL::Drafts;
 
 require "bin/mozilla/common.pl";
@@ -16,19 +18,21 @@ sub save_draft {
 
   if (!$form->{draft_id} && !$form->{draft_description}) {
     restore_form($form->{SAVED_FORM}, 1) if ($form->{SAVED_FORM});
-    delete($form->{SAVED_FORM});
-    $form->{SAVED_FORM} = save_form();
+    delete $form->{SAVED_FORM};
+
+    $form->{SAVED_FORM}   = save_form();
+    $form->{remove_draft} = 1;
 
     $form->header();
     print($form->parse_html_template("drafts/save_new"));
+
     return $lxdebug->leave_sub();
   }
 
-  my ($draft_id, $draft_description) =
-    ($form->{draft_id}, $form->{draft_description});
+  my ($draft_id, $draft_description) = ($form->{draft_id}, $form->{draft_description});
 
   restore_form($form->{SAVED_FORM}, 1);
-  delete($form->{SAVED_FORM});
+  delete $form->{SAVED_FORM};
 
   Drafts->save(\%myconfig, $form, $draft_id, $draft_description);
 
@@ -44,8 +48,7 @@ sub remove_draft {
 
   Drafts->remove(\%myconfig, $form, $form->{draft_id}) if ($form->{draft_id});
 
-  delete($form->{draft_id});
-  delete($form->{draft_description});
+  delete @{$form}{qw(draft_id draft_description)};
 
   $lxdebug->leave_sub();
 }
@@ -63,7 +66,7 @@ sub load_draft_maybe {
 
   $draft_nextsub = "add" unless ($draft_nextsub);
 
-  delete($form->{action});
+  delete $form->{action};
   my $saved_form = save_form();
 
   $form->header();
@@ -80,14 +83,14 @@ sub load_draft_maybe {
 sub dont_load_draft {
   $lxdebug->enter_sub();
 
-  my $draft_nextsub = $form->{draft_nextsub};
-  $draft_nextsub = "add" unless ($form->{draft_nextsub});
+  my $draft_nextsub = $form->{draft_nextsub} || "add";
+
   restore_form($form->{SAVED_FORM}, 1);
-  delete($form->{SAVED_FORM});
-  delete($form->{action});
+  delete $form->{SAVED_FORM};
+
   $form->{DONT_LOAD_DRAFT} = 1;
 
-  &{ $draft_nextsub }();
+  call_sub($draft_nextsub);
 
   $lxdebug->leave_sub();
 }
@@ -96,11 +99,15 @@ sub load_draft {
   $lxdebug->enter_sub();
 
   my ($old_form, $id, $description) = Drafts->load(\%myconfig, $form, $form->{id});
+
   if ($old_form) {
-    restore_form($old_form, 1);
-    $form->{draft_id} = $id;
-    $form->{draft_description} = $description;
-    $form->{remove_draft} = 'checked';
+    $old_form = YAML::Load($old_form);
+
+    @{$form}{keys %{ $old_form } } = @{$old_form}{keys %{ $old_form } };
+
+    $form->{draft_id}              = $id;
+    $form->{draft_description}     = $description;
+    $form->{remove_draft}          = 'checked';
   }
 
   update();
@@ -112,12 +119,13 @@ sub delete_drafts {
   $lxdebug->enter_sub();
 
   my @ids;
-  foreach (keys(%{$form})) {
-    push(@ids, $1) if (/^checked_(.*)/ && $form->{$_});
+  foreach (keys %{$form}) {
+    push @ids, $1 if (/^checked_(.*)/ && $form->{$_});
   }
   Drafts->remove(\%myconfig, $form, @ids) if (@ids);
+
   restore_form($form->{SAVED_FORM}, 1);
-  delete($form->{SAVED_FORM});
+  delete $form->{SAVED_FORM};
 
   add();
 
@@ -129,6 +137,7 @@ sub draft_action_dispatcher {
 
   if ($form->{draft_action} eq $locale->text("Skip")) {
     dont_load_draft();
+
   } elsif ($form->{draft_action} eq $locale->text("Delete drafts")) {
     delete_drafts();
   }