Merge branch 'master' of lx-office.linet-services.de:lx-office-erp

diff --git a/SL/Auth.pm b/SL/Auth.pm
index ff77bfcc795b20b9dfd7e85f0303a3439367399d..569ec2149f5a44f31724e9024e7462d42c94646e 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -1117,7 +1117,7 @@ sub load_rights_for_user {
   my $dbh   = $self->dbconnect;
   my ($query, $sth, $row, $rights);
 
-  $rights = { map { $rights->{$_} = 0 } all_rights() };
+  $rights = { map { $rights->{$_} => 0 } all_rights() };
 
   $query =
     qq|SELECT gr."right", gr.granted

diff --git a/SL/Drafts.pm b/SL/Drafts.pm
index 891775bc08290a94b2faaa8a5955e06a93f06eb9..4a29b1925c07fcc12c4404f6d56fb7a27c3c3298 100644 (file)
--- a/SL/Drafts.pm
+++ b/SL/Drafts.pm
@@ -45,7 +45,8 @@ sub save {
 
   my ($dbh, $sth, $query, %saved, $dumped);
 
-  $dbh = $form->dbconnect_noauto($myconfig);
+  $dbh = $form->get_standard_dbh;
+  $dbh->begin_work;
 
   my ($module, $submodule) = $self->get_module($form);
 
@@ -72,7 +73,6 @@ sub save {
   do_query($form, $dbh, $query, $draft_description, $dumped, $form->{login}, $draft_id);
 
   $dbh->commit();
-  $dbh->disconnect();
 
   $form->{draft_id}          = $draft_id;
   $form->{draft_description} = $draft_description;
@@ -87,7 +87,7 @@ sub load {
 
   my ($dbh, $sth, $query, @values);
 
-  $dbh = $form->dbconnect($myconfig);
+  $dbh = $form->get_standard_dbh;
 
   $query = qq|SELECT id, description, form FROM drafts WHERE id = ?|;
 
@@ -98,8 +98,6 @@ sub load {
   }
   $sth->finish();
 
-  $dbh->disconnect();
-
   $main::lxdebug->leave_sub();
 
   return @values;
@@ -114,13 +112,11 @@ sub remove {
 
   my ($dbh, $sth, $query);
 
-  $dbh = $form->dbconnect($myconfig);
+  $dbh = $form->get_standard_dbh;
 
   $query = qq|DELETE FROM drafts WHERE id IN (| . join(", ", map { "?" } @draft_ids) . qq|)|;
   do_query($form, $dbh, $query, @draft_ids);
 
-  $dbh->disconnect();
-
   $main::lxdebug->leave_sub();
 }