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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-06-13 18:37:18 -07:00
commit 9731a31cb6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -942,7 +942,7 @@ class SettingsController extends Controller
$setting->ldap_lname_field = $request->input('ldap_lname_field'); $setting->ldap_lname_field = $request->input('ldap_lname_field');
$setting->ldap_fname_field = $request->input('ldap_fname_field'); $setting->ldap_fname_field = $request->input('ldap_fname_field');
$setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query'); $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
$setting->ldap_version = $request->input('ldap_version'); $setting->ldap_version = $request->input('ldap_version', 3);
$setting->ldap_active_flag = $request->input('ldap_active_flag'); $setting->ldap_active_flag = $request->input('ldap_active_flag');
$setting->ldap_emp_num = $request->input('ldap_emp_num'); $setting->ldap_emp_num = $request->input('ldap_emp_num');
$setting->ldap_email = $request->input('ldap_email'); $setting->ldap_email = $request->input('ldap_email');

2
app/Models/Ldap.php
View file

@ -37,7 +37,7 @@ class Ldap extends Model
public static function connectToLdap() public static function connectToLdap()
{ {
$ldap_host = Setting::getSettings()->ldap_server; $ldap_host = Setting::getSettings()->ldap_server;
$ldap_version = Setting::getSettings()->ldap_version; $ldap_version = Setting::getSettings()->ldap_version ?: 3;
$ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore; $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore;
$ldap_use_tls = Setting::getSettings()->ldap_tls; $ldap_use_tls = Setting::getSettings()->ldap_tls;

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -318,7 +318,7 @@
item_icon = 'fas fa-user'; item_icon = 'fas fa-user';
} else if (value.type == 'location') { } else if (value.type == 'location') {
item_destination = 'locations' item_destination = 'locations'
item_icon = 'far fa-map-marker-alt'; item_icon = 'fas fa-map-marker-alt';
} }
return '<nobr><a href="{{ url('/') }}/' + item_destination +'/' + value.id + '" data-tooltip="true" title="' + value.type + '"><i class="' + item_icon + ' text-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} "></i> ' + value.name + '</a></nobr>'; return '<nobr><a href="{{ url('/') }}/' + item_destination +'/' + value.id + '" data-tooltip="true" title="' + value.type + '"><i class="' + item_icon + ' text-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} "></i> ' + value.name + '</a></nobr>';