Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / DB / Manager / Employee.pm

diff --git a/SL/DB/Manager/Employee.pm b/SL/DB/Manager/Employee.pm
index b4ebf14..400843b 100644 (file)
--- a/SL/DB/Manager/Employee.pm
+++ b/SL/DB/Manager/Employee.pm
@@ -3,15 +3,26 @@ package SL::DB::Manager::Employee;
 use strict;
 
 use SL::DB::Helper::Manager;
+use SL::DB::Helper::Sorted;
 use base qw(SL::DB::Helper::Manager);
 
 sub object_class { 'SL::DB::Employee' }
 
 __PACKAGE__->make_manager_methods;
 
+sub _sort_spec {
+  (
+    default  => [ 'name', 1 ],
+    columns  => {
+      SIMPLE => 'ALL',
+      map { +($_ => "lower(employee.$_)") } qw(deleted_email deleted_fax deleted_signature deleted_tel login name)
+    },
+  );
+}
+
 sub current {
-  return undef unless $::form && $::form->{login};
-  return shift->find_by(login => $::form->{login});
+  return undef unless $::myconfig{login};
+  return $::request->cache('current')->{object} //= shift->find_by(login => $::myconfig{login});
 }
 
 sub update_entries_for_authorized_users {
@@ -20,13 +31,14 @@ sub update_entries_for_authorized_users {
   my %employees_by_login = map { ($_->login => $_) } @{ $class->get_all };
 
   require SL::DB::AuthClient;
+  no warnings 'once';
+
   foreach my $user (@{ SL::DB::AuthClient->new(id => $::auth->client->{id})->load->users || [] }) {
     my $user_config = $user->config_values;
     my $employee    = $employees_by_login{$user->login} || SL::DB::Employee->new(login => $user->login);
 
     $employee->update_attributes(
       name      => $user_config->{name},
-      workphone => $user_config->{tel},
       deleted   => 0,
     );
   }
@@ -60,8 +72,8 @@ Returns an RDBO instance corresponding to the currently logged-in user.
 For each user created by the administrator in the admin section an
 entry only exists in the authentication table, but not in the employee
 table. This is where this function comes in: It iterates over all
-authentication users that have access to the current client and ensure
-than an entry for them exists in the table C<employee>. The matching
+authentication users that have access to the current client and ensures
+that an entry for them exists in the table C<employee>. The matching
 is done via the login name which must be the same in both tables.
 
 The only other properties that will be copied from the authentication