DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

select options working, testing sync then done

Browse source
This commit is contained in:
Godfrey M 2022-08-31 12:58:33 -07:00
parent 70ac8af9c4
commit 193b31e427
5 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/AssetMaintenancesController.php
View file

@ -184,6 +184,7 @@ class AssetMaintenancesController extends Controller
->with('selectedAsset', null)
->with('assetMaintenanceType', $assetMaintenanceType)
->with('item', $assetMaintenance);
dd($item);
}
/**

1
app/Http/Controllers/SettingsController.php
View file

@ -958,7 +958,6 @@ class SettingsController extends Controller
$setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
}
$setting->ldap_basedn = $request->input('ldap_basedn');
$setting->ldap_default_group_check = $request->input('ldap_default_group_check');
$setting->ldap_default_group = $request->input('ldap_default_group');
$setting->ldap_filter = $request->input('ldap_filter');
$setting->ldap_username_field = $request->input('ldap_username_field');

4
database/migrations/2022_08_25_213308_adds_ldap_default_group_to_settings_table.php
View file

@ -14,8 +14,8 @@ class AddsLdapDefaultGroupToSettingsTable extends Migration
public function up()
{
Schema::table('settings', function (Blueprint $table) {
$table->string('ldap_default_group')
->after('ldap_base_dn');
$table->integer('ldap_default_group')
->after('ldap_basedn');
});
}

2
resources/lang/en/admin/settings/general.php
View file

@ -76,7 +76,7 @@ return [
'laravel' => 'Laravel Version',
'ldap' => 'LDAP',
'ldap_default_group' => 'Default Permissions Group',
'ldap_default_group_info' => 'Check this box if you would like to apply a permissions group to new LDAP users.',
'ldap_default_group_info' => 'Select a group to assign to newly synced users, remember that a user takes on the permissions of the group they are assigned.',
'ldap_help' => 'LDAP/Active Directory',
'ldap_client_tls_key' => 'LDAP Client TLS Key',
'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate',

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

@ -92,9 +92,13 @@
</div>
<!-- Default LDAP Permissions Group Select -->
<div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
<label class="col-md-3 control-label" for="group"> {{ trans('general.groups') }}</label>
<div class="col-md-6">
<div class="col-md-3">
{{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }}
</div>
<div class="col-md-9">
@if ($groups->count())
@if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
@ -106,30 +110,30 @@
<span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
@else
<div class="controls">
<select
name="group"
aria-label="group"
id="group"
multiple="multiple"
class="form-control">
@else
<div class="controls">
<select
name="ldap_default_group"
aria-label="ldap_default_group"
id="ldap_default_group"
class="form-control"
>
@foreach ($groups as $id => $group)
<option value="{{ $id }}"
{{ $group }}
</option>
@endforeach
</select>
@foreach ($groups as $id => $group)
<option value="{{ $id }}">
{{ $group }}
</option>
@endforeach
</select>
<span class="help-block">
{{ trans('admin/users/table.groupnotes') }}
{{ trans('admin/settings/general.ldap_default_group_info') }}
</span>
</div>
@endif
@endif
@else
<p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
@endif
@endif
</div>
</div>