Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index 10e319ba396de6ef8cd7a38c3b28e8f41e5e3250..2040297b10e13fd8bc3f58951067ab35ad2f3087 100644 (file)
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -84,9 +84,10 @@ sub data_as_hash {
 sub set_data {
   my ($self, %data) = @_;
 
-  my $data = YAML::Load($self->data);
-  $data->{$_} = $data{$_} for keys %data;
-  $self->data(YAML::Dump($data));
+  $self->data(YAML::Dump({
+    %{ $self->data_as_hash },
+    %data,
+  }));
 
   $self;
 }

diff --git a/SL/Dispatcher/AuthHandler/Admin.pm b/SL/Dispatcher/AuthHandler/Admin.pm
index 9ef6ef388995f88b95361c05039983d4f9940232..06fd3cfe3c2991b42f831ddadf2788aef57ec1c6 100644 (file)
--- a/SL/Dispatcher/AuthHandler/Admin.pm
+++ b/SL/Dispatcher/AuthHandler/Admin.pm
@@ -23,7 +23,6 @@ sub handle {
   }
 
   $::request->{layout} = SL::Layout::Dispatcher->new(style => 'admin');
-  $::request->layout->no_menu(1);
   $::auth->delete_session_value('admin_password');
   $::auth->punish_wrong_login;
   SL::Dispatcher::show_error('admin/adminlogin', 'password');