Lot's of bug fixes
This commit is contained in:
BuildTools
parent
ad320963fc
commit
7718ed6c32
196 changed files with 51167 additions and 3010 deletions
|
|
@ -1,57 +1,12 @@
|
|||
@extends('layouts.admin')
|
||||
|
||||
@section('css')
|
||||
<link href="{{ asset('assets/css/bootstrap-multiselect.css') }}" rel="stylesheet">
|
||||
@endsection
|
||||
|
||||
@section('page', 'User Manager')
|
||||
|
||||
@section('navigation')
|
||||
<li class="treeview">
|
||||
<a>
|
||||
<i class="fas fa-user"></i> <span>Account</span>
|
||||
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li><a href="{{ route('panel.profile') }}"><i class="fas fa-id-badge"></i> Profile</a></li>
|
||||
<li><a href="{{ route('panel.change') }}"><i class="fas fa-clipboard"></i> Change</a></li>
|
||||
<li class="hidden-xs"><a href="{{ route('panel.security') }}"><i class="fas fa-lock"></i> Security</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="header">NAVIGATION</li>
|
||||
<li>
|
||||
<a href="{{ route('panel.home') }}"><i class="fas fa-tachometer-alt"></i> <span>Dashboard</span></a>
|
||||
</li>
|
||||
@canany(['project_see', 'status_see'])
|
||||
<li class="treeview">
|
||||
<a>
|
||||
<i class="fas fa-list"></i> <span>Projects</span>
|
||||
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
@can('project_see')<li><a href="{{ route('panel.project') }}"><i class="fas fa-clipboard"></i> Project</a></li>@endcan
|
||||
@can('order_see')<li><a href="{{ route('panel.order') }}"><i class="fas fa-file-invoice"></i> Order</a></li>@endcan
|
||||
@can('status_see')<li><a href="{{ route('panel.status') }}"><i class="fas fa-clipboard"></i> Status</a></li>@endcan
|
||||
</ul>
|
||||
</li>
|
||||
@endcanany
|
||||
<li class="active treeview menu-open">
|
||||
<a>
|
||||
<i class="fas fa-user"></i> <span>Management</span>
|
||||
<span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li class="active"><a><i class="fas fa-id-badge"></i> Users</a></li>
|
||||
@can('roles_see')<li><a href="{{ route('panel.role') }}"><i class="fas fa-lock"></i> Roles</a></li>@endcan
|
||||
</ul>
|
||||
</li>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="col-xs-12 col-lg-6 col-lg-offset-3 col-md-8 col-md-offset-2">
|
||||
<div class="box box-primary">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title" style="margin-top: 8px"><strong>#{{ $user->id }}: </strong>{{ $user->fullname() }}</h3>
|
||||
<h3 class="box-title" style="margin-top: 8px"><strong>Username: </strong>{{ $user->username() }}</h3>
|
||||
<small style="float: right"><a class="btn btn-primary" href="{{ route('panel.ums') }}">Back</a></small>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
|
@ -78,35 +33,23 @@
|
|||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="form-group @error('roles') has-error @enderror">
|
||||
<label for="roles" class="text-md-right">{{ __('Roles:') }}</label>
|
||||
|
||||
<select class="form-control" id="roles" name="roles[]" multiple>
|
||||
@if(!empty($roles))
|
||||
@foreach($roles as $role)
|
||||
<option value="{{ $role->name }}" @if($user->hasRole($role->name)) selected @endif >{{ $role->readable_name }}</option>
|
||||
@endforeach
|
||||
@endif
|
||||
<div class="form-group">
|
||||
<label>Verified:</label>
|
||||
<select name="verified" class="form-control" style="width: 100%;" tabindex="-1" aria-hidden="true">
|
||||
<option value="0" @if(empty($user->email_verified_at)) selected="selected" @endif >Unverified</option>
|
||||
<option value="1" @if(!empty($user->email_verified_at)) selected="selected" @endif >Verified</option>
|
||||
</select>
|
||||
@error('roles')
|
||||
<span class="help-block">{{ $message }}</span>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="form-group @error('permissions') has-error @enderror">
|
||||
<label for="permissions" class="text-md-right">{{ __('Permissions:') }}</label>
|
||||
|
||||
<select class="form-control" id="permissions" name="permissions[]" multiple>
|
||||
@if(!empty($permissions))
|
||||
@foreach($permissions as $permission)
|
||||
<option value="{{ $permission->name }}" @if($user->hasDirectPermission($permission->name)) selected @endif >{{ $permission->name }}</option>
|
||||
@endforeach
|
||||
@endif
|
||||
@if(Auth::user()->is_root)
|
||||
<div class="form-group">
|
||||
<label>Role:</label>
|
||||
<select name="admin" class="form-control" style="width: 100%;" tabindex="-1" aria-hidden="true">
|
||||
<option value="0" @if(!$user->is_admin && !$user->is_root) selected="selected" @endif >Normal</option>
|
||||
<option value="1" @if($user->is_admin && !$user->is_root) selected="selected" @endif >Admin</option>
|
||||
<option value="2" @if(!$user->is_admin && $user->is_root) selected="selected" @endif >Root</option>
|
||||
</select>
|
||||
@error('permissions')
|
||||
<span class="help-block">{{ $message }}</span>
|
||||
@enderror
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<button type="submit" class="btn btn-block btn-primary">{{ __('Edit User') }}</button>
|
||||
</form>
|
||||
|
|
@ -114,20 +57,3 @@
|
|||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('javascript')
|
||||
<script src="{{ asset('assets/js/bootstrap-multiselect.js') }}"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
$('#roles').multiselect({
|
||||
includeSelectAllOption: true,
|
||||
enableFiltering: true
|
||||
});
|
||||
|
||||
$('#permissions').multiselect({
|
||||
includeSelectAllOption: true,
|
||||
enableFiltering: true
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
|
|||
Reference in a new issue