DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

tinkering to no avail

Browse source
This commit is contained in:
Godfrey M 2022-09-13 11:40:10 -07:00
parent 28bc97f29f
commit 9b448227f7
4 changed files with 479 additions and 477 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,11 +217,6 @@ class LdapSync extends Command
$user->jobtitle = $item['jobtitle'];
$user->country = $item['country'];
$user->department_id = $department->id;
$user->groups()->sync($ldap_default_group, $user->id);
if($item['manager'] != null) {
// Get the LDAP Manager
@ -309,6 +304,11 @@ class LdapSync extends Command
if ($user->save()) {
$item['note'] = $item['createorupdate'];
$item['status'] = 'success';
if($ldap_default_group != null) {
$user->groups()->sync($ldap_default_group);
}
} else {
foreach ($user->getErrors()->getMessages() as $key => $err) {
$errors .= $err[0];

1
app/Http/Controllers/Users/UsersController.php
View file

@ -133,6 +133,7 @@ class UsersController extends Controller
if ($user->save()) {
if ($request->filled('groups')) {
$user->groups()->sync($request->input('groups'));
} else {
$user->groups()->sync([]);

937
composer.lock generated
View file

File diff suppressed because it is too large Load diff

8
resources/views/settings/ldap.blade.php
View file

@ -126,13 +126,13 @@
@endforeach
</select>
<span class="help-block">
<span class="help-block">
{{ trans('admin/settings/general.ldap_default_group_info') }}
</span>
</div>
</div>
@endif
@else
<p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
@else
<p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
@endif
</div>