Employee::current statt manuell an weiteren Stellen

diff --git a/SL/AM.pm b/SL/AM.pm
index 57e6b445abf44c388e3bc682401b98401f929dc8..9780078f514bee6876c7138ad0cce70722e31e74 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -556,7 +556,7 @@ sub save_preferences {
 
   my ($self, $form) = @_;
 
 
   my ($self, $form) = @_;
 

-  my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login});
+  my $employee = SL::DB::Manager::Employee->current;

   $employee->update_attributes(name => $form->{name});
 
   my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login});
   $employee->update_attributes(name => $form->{name});
 
   my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login});

diff --git a/SL/Controller/CsvImport/Helper/Consistency.pm b/SL/Controller/CsvImport/Helper/Consistency.pm
index d1ce92bb10a628532349a331b960fc4847aed04b..5538a738c864cb7e76c87cf7807a6025aa855121 100644 (file)
--- a/SL/Controller/CsvImport/Helper/Consistency.pm
+++ b/SL/Controller/CsvImport/Helper/Consistency.pm
@@ -208,7 +208,7 @@ sub handle_salesman {
     if ($vc_obj && $vc_obj->salesman_id) {
       $object->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id));
     } else {
     if ($vc_obj && $vc_obj->salesman_id) {
       $object->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id));
     } else {

-      $object->salesman(SL::DB::Manager::Employee->find_by(login => $::myconfig{login}));
+      $object->salesman(SL::DB::Manager::Employee->current);

     }
   }
 }
     }
   }
 }

diff --git a/SL/Controller/CsvImport/Inventory.pm b/SL/Controller/CsvImport/Inventory.pm
index c724fb8fc96cca4604001b0909d6b4f9e385b23b..7dbe364d8238bce9cb180be4a9279d7f29c0cce9 100644 (file)
--- a/SL/Controller/CsvImport/Inventory.pm
+++ b/SL/Controller/CsvImport/Inventory.pm
@@ -370,7 +370,7 @@ sub handle_employee {
 
   # employee from login if not given
   if (!$object->employee_id) {
 
   # employee from login if not given
   if (!$object->employee_id) {

-    $object->employee_id(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})->id);
+    $object->employee_id(SL::DB::Manager::Employee->current->id) if SL::DB::Manager::Employee->current;

   }
 
   if ($object->employee_id) {
   }
 
   if ($object->employee_id) {