DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Logic added to handle when a cloned user is imported via LDAP. (#9429)

Browse source
This commit is contained in:
Ivan Nieto Vivanco 2021-04-14 11:19:25 -05:00 committed by GitHub
parent 3824a50e8b
commit 9cf5fbd675
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/users/edit.blade.php
View file

@ -106,7 +106,7 @@
<div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}"> <div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="username">{{ trans('admin/users/table.username') }}</label> <label class="col-md-3 control-label" for="username">{{ trans('admin/users/table.username') }}</label>
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}"> <div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}">
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
<input <input
class="form-control" class="form-control"
type="text" type="text"
@ -137,7 +137,7 @@
{{ trans('admin/users/table.password') }} {{ trans('admin/users/table.password') }}
</label> </label>
<div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'password')) ? ' required' : '' }}"> <div class="col-md-6{{ (\App\Helpers\Helper::checkIfRequired($user, 'password')) ? ' required' : '' }}">
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone') )
<input <input
type="password" type="password"
name="password" name="password"
@ -161,7 +161,7 @@
</div> </div>
</div> </div>
@if ($user->ldap_import!='1') @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
<!-- Password Confirm --> <!-- Password Confirm -->
<div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}"> <div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="password_confirmation"> <label class="col-md-3 control-label" for="password_confirmation">