lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #11707 from wewhite/manager_name

Browse source 
Fixed #11706 Manager name
This commit is contained in:
snipe 2022-08-22 16:15:52 -07:00 • committed by GitHub
commit aba8449dc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Console/Commands/LdapSync.php
View file

@ -217,15 +217,22 @@ class LdapSync extends Command
$user->department_id = $department->id; $user->department_id = $department->id;
if($item['manager'] != null) { if($item['manager'] != null) {
//Captures only the Canonical Name // Get the LDAP Manager
$item['manager'] = ltrim($item['manager'], "CN="); $ldap_manager = Ldap::findLdapUsers($item['manager'], -1, $this->option('filter'));
$item['manager'] = substr($item['manager'],0, strpos($item['manager'], ','));
$ldap_manager = User::where('username', $item['manager'])->first(); if($ldap_manager["count"] > 0) {
// Get the Managers username
$ldapManagerUsername = $ldap_manager[0][$ldap_result_username][0];
// Get User from Manager username.
$ldap_manager = User::where('username', $ldapManagerUsername)->first();
if ( $ldap_manager && isset($ldap_manager->id) ) { if ( $ldap_manager && isset($ldap_manager->id) ) {
// Link user to manager id.
$user->manager_id = $ldap_manager->id; $user->manager_id = $ldap_manager->id;
} }
} }
}
// Sync activated state for Active Directory. // Sync activated state for Active Directory.
if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set.... if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....

2
app/Http/Transformers/UsersTransformer.php
View file

@ -33,7 +33,7 @@ class UsersTransformer
'employee_num' => e($user->employee_num), 'employee_num' => e($user->employee_num),
'manager' => ($user->manager) ? [ 'manager' => ($user->manager) ? [
'id' => (int) $user->manager->id, 'id' => (int) $user->manager->id,
'name'=> e($user->manager->username), 'name'=> e($user->manager->first_name).' '.e($user->manager->last_name),
] : null, ] : null,
'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null, 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
'phone' => ($user->phone) ? e($user->phone) : null, 'phone' => ($user->phone) ? e($user->phone) : null,