diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 35f3779cc2..fcde17772f 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -81,6 +81,7 @@ class UsersController extends Controller $permissions = config('permissions'); $userPermissions = Helper::selectedPermissionsArray($permissions, Input::old('permissions', array())); + $permissions = $this->filterDisplayable($permissions); $location_list = Helper::locationsList(); $manager_list = Helper::managerList(); @@ -233,6 +234,17 @@ class UsersController extends Controller * @param int $id * @return View */ + + private function filterDisplayable($permissions) { + $output = null; + foreach($permissions as $key=>$permission) { + $output[$key] = array_filter($permission, function($p) { + return $p['display'] === true; + }); + } + return $output; + } + public function getEdit($id = null) { try { @@ -249,7 +261,7 @@ class UsersController extends Controller $userGroups = $user->groups()->pluck('name', 'id'); $user->permissions = $user->decodePermissions(); $userPermissions = Helper::selectedPermissionsArray($permissions, $user->permissions); - + $permissions = $this->filterDisplayable($permissions); $location_list = Helper::locationsList(); $company_list = Helper::companyList(); $manager_list = Helper::managerList(); @@ -282,7 +294,6 @@ class UsersController extends Controller // permissions here before we update the user. $permissions = $request->input('permissions', array()); app('request')->request->set('permissions', $permissions); - // Only update the email address if locking is set to false if (config('app.lock_passwords')) { return redirect()->route('users')->with('error', 'Denied! You cannot update user information on the demo.'); @@ -333,7 +344,6 @@ class UsersController extends Controller $user->notes = e($request->input('notes')); $user->permissions = json_encode($request->input('permission')); - if ($user->manager_id == "") { $user->manager_id = null; } diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 63b352817c..e3cce527bf 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -126,41 +126,41 @@
- + @endcan @can('admin') @@ -288,7 +288,6 @@ @@ -434,7 +432,7 @@ @lang('general.pending') @lang('general.undeployable') @lang('admin/hardware/general.archived') - @lang('admin/hardware/general.requestable') + @lang('admin/hardware/general.requestable')
  •  
    • diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 8eae09e113..a929350893 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -21,25 +21,58 @@ @section('content')
    - + @@ -49,329 +82,406 @@ input[type='text'][disabled], input[disabled], textarea[disabled], input[readonl
  • Information
  • Permissions
    • +
    - -
    - -
    - - {!! $errors->first('first_name', ':message') !!} + +
    + +
    + + {!! $errors->first('first_name', ':message') !!} +
    -
    - -
    - -
    + +
    + +
    {!! $errors->first('last_name', ':message') !!} +
    -
    - - -
    - -
    - @if ($user->ldap_import!='1') - id)) ? ' disabled' : '') }} autocomplete="false" readonly onfocus="this.removeAttribute('readonly');"> - @if (config('app.lock_passwords') && ($user->id)) + +
    + +
    + @if ($user->ldap_import!='1') + id)) ? ' disabled' : '') }} + > + @if (config('app.lock_passwords') && ($user->id))

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - @else - (Managed via LDAP) - @endif - - {!! $errors->first('username', ':message') !!} -
    -
    - - - -
    - -
    - @if ($user->ldap_import!='1') - id)) ? ' disabled' : '') }} autocomplete="false" readonly onfocus="this.removeAttribute('readonly');"> - @else - (Managed via LDAP) - @endif - - {!! $errors->first('password', ':message') !!} -
    -
    - @if ($user->ldap_import!='1') - Generate - @endif -
    -
    - - @if ($user->ldap_import!='1') - -
    - -
    - id)) ? ' disabled' : '') }} autocomplete="off"> - @if (config('app.lock_passwords') && ($user->id)) -

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - {!! $errors->first('password_confirm', ':message') !!} -
    -
    - @endif - - - -
    - -
    - id)) ? ' disabled' : '') }} autocomplete="off" readonly onfocus="this.removeAttribute('readonly');"> - @if (config('app.lock_passwords') && ($user->id)) -

    {{ trans('admin/users/table.lock_passwords') }}

    - @endif - - {!! $errors->first('email', ':message') !!} -
    -
    - - - @if (\App\Models\Company::canManageUsersCompanies()) - -
    -
    - {{ Form::label('company_id', trans('general.company')) }} -
    -
    - {{ Form::select('company_id', $company_list , Input::old('company_id', $user->company_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('company_id', ':message') !!} -
    -
    - @endif - - - - - -
    - -
    - {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} - {!! $errors->first('locale', ':message') !!} -
    -
    - - - -
    - -
    - - {!! $errors->first('employee_num', ':message') !!} -
    -
    - - - -
    - -
    - - {!! $errors->first('jobtitle', ':message') !!} -
    -
    - - - -
    - -
    - {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('manager_id', ':message') !!} -
    -
    - - -
    - -
    - {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:350px')) }} - {!! $errors->first('location_id', ':message') !!} -
    -
    - - -
    - -
    - - {!! $errors->first('phone', ':message') !!} -
    -
    - - -
    - -
    -
    - id === Auth::user()->id ? ' disabled="disabled"' : '') }} name="activated" id="activated" {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}> - @if ($user->id) - - + @endif @else - - + (Managed via LDAP) @endif - - - {!! $errors->first('activated', ':message') !!} -
    -
    -
    - - -
    - -
    - - {!! $errors->first('notes', ' :message') !!} -
    -
    - - -
    - -
    -
    - - - - - {{ trans('admin/users/table.groupnotes') }} - - -
    -
    + {!! $errors->first('username', ':message') !!} +
    +
    + + +
    + +
    + @if ($user->ldap_import!='1') + id)) ? ' disabled' : '') }} + > + @else + (Managed via LDAP) + @endif + + {!! $errors->first('password', ':message') !!} +
    +
    + @if ($user->ldap_import!='1') + Generate + @endif +
    +
    + + @if ($user->ldap_import!='1') + +
    + +
    + id)) ? ' disabled' : '') }} + > + @if (config('app.lock_passwords') && ($user->id)) +

    {{ trans('admin/users/table.lock_passwords') }}

    + @endif + {!! $errors->first('password_confirm', ':message') !!} +
    +
    + @endif + + +
    + +
    + id)) ? ' disabled' : '') }} + autocomplete="off" + readonly + onfocus="this.removeAttribute('readonly');" + > + @if (config('app.lock_passwords') && ($user->id)) +

    {{ trans('admin/users/table.lock_passwords') }}

    + @endif + {!! $errors->first('email', ':message') !!} +
    +
    + + + @if (\App\Models\Company::canManageUsersCompanies()) + +
    +
    + {{ Form::label('company_id', trans('general.company')) }} +
    +
    + {{ Form::select('company_id', $company_list , Input::old('company_id', $user->company_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('company_id', ':message') !!} +
    +
    + @endif + + +
    + +
    + {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! $errors->first('locale', ':message') !!} +
    +
    + + +
    + +
    + + {!! $errors->first('employee_num', ':message') !!}
    - - @if (!$user->id) - -
    -
    -
    -
    -
    -
    -
    -
    - @endif -
    -
    -
    -
    -
    - @if (!Auth::user()->isSuperUser()) -

    Only superadmins may grant a user superadmin access.

    - @endif + +
    + +
    + + {!! $errors->first('jobtitle', ':message') !!} +
    +
    - - @foreach ($permissions as $area => $permission) + +
    + +
    + {{ Form::select('manager_id', $manager_list , Input::old('manager_id', $user->manager_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('manager_id', ':message') !!} +
    +
    + +
    + +
    + {{ Form::select('location_id', $location_list , Input::old('location_id', $user->location_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {!! $errors->first('location_id', ':message') !!} +
    +
    - @for ($i = 0; $i < count($permission); $i++) - +
    + +
    + + {!! $errors->first('phone', ':message') !!} +
    +
    - ?> - - @if ($counter == 2) -
    - @endif - - - @if ($permission[$i]['display']) -

    {{ $area }}: {{ $permission[$i]['label'] }}

    -

    {{ $permission[$i]['note'] }}

    - - -
    - - - - - - -
    -
    + +
    + +
    +
    + + {!! $errors->first('activated', ':message') !!} +
    +
    + +
    + +
    + + {!! $errors->first('notes', ' :message') !!} +
    +
    + +
    + +
    +
    + + + + {{ trans('admin/users/table.groupnotes') }} + +
    +
    +
    + + @if (!$user->id) + +
    +
    +
    +
    +
    + +
    +
    +
    + @endif +
    +
    +
    + +
    +
    + @if (!Auth::user()->isSuperUser()) +

    Only superadmins may grant a user superadmin access.

    + @endif +
    + + + + + + + + + + @foreach ($permissions as $area => $permissionsArray) + @if (count($permissionsArray) == 1) + + + + + + + + + + @else + + + + + + + + @foreach ($permissionsArray as $index => $permission) + + @if ($permission['display']) + + + + + + @endif + + @endforeach + + @endif + @endforeach +
    PermissionGrantDenyInherit
    +

    {{ $area . ': ' . $localPermission['label'] }}

    +     		+ + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }} + + + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }} + + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }} +
    +

    {{ $area }}

    +     		+ {{ Form::radio("$area", '1',false,['value'=>"grant"]) }} + + {{ Form::radio("$area", '-1',false,['value'=>"deny"]) }} + + {{ Form::radio("$area", '0',false,['value'=>"inherit"] ) }} +
    + {{ $permission['label'] }} + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled']) }} + @else + {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant"]) }} + @endif + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled']) }} + + @else + {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny"]) }} + @endif + + @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled']) }} + @else + {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit"]) }} + @endif +
    - - - +
    +
    +@stop @section('moar_scripts') + + @stop - -@stop