mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-11 08:04:09 -08:00
Merge branch 'develop'
This commit is contained in:
commit
d6e0012818
|
@ -70,7 +70,7 @@ class LdapSync extends Command
|
||||||
$results = Ldap::findLdapUsers();
|
$results = Ldap::findLdapUsers();
|
||||||
|
|
||||||
// Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
|
// Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
|
||||||
$ldap_ou_locations = Location::whereNotNull('ldap_ou')->get()->toArray();
|
$ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
|
||||||
$ldap_ou_lengths = array();
|
$ldap_ou_lengths = array();
|
||||||
|
|
||||||
foreach ($ldap_ou_locations as $location) {
|
foreach ($ldap_ou_locations as $location) {
|
||||||
|
|
Loading…
Reference in a new issue