diff --git a/DataTables/PermissionsDataTable.php b/DataTables/PermissionsDataTable.php index 6cc2aa2..c08c56a 100644 --- a/DataTables/PermissionsDataTable.php +++ b/DataTables/PermissionsDataTable.php @@ -28,7 +28,7 @@ ->rawColumns(['action', 'role']) ->addIndexColumn() ->addColumn('name', function (PermissionGroup $model) { - return $model->name; + return $model->name ?? ""; }) ->addColumn('role', function (PermissionGroup $model) { $role = $model->roles($model); diff --git a/Http/Controllers/Auth/AuthenticatedSessionController.php b/Http/Controllers/Auth/AuthenticatedSessionController.php index 097d783..68b44c8 100644 --- a/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -19,9 +19,8 @@ * * @return \Illuminate\Http\RedirectResponse */ - public function store(Request $request) + public function store(LoginRequest $request) { - $request->authenticate(); $request->session()->regenerate(); diff --git a/Resources/views/users/permissions/_checkbox.blade.php b/Resources/views/users/permissions/_checkbox.blade.php index 76afd5d..1370a8b 100644 --- a/Resources/views/users/permissions/_checkbox.blade.php +++ b/Resources/views/users/permissions/_checkbox.blade.php @@ -15,7 +15,7 @@ @endphp @foreach($role as $row) - {{ $row->name }} + {{ $row->name ?? "" }} @php $i++ @endphp @endforeach diff --git a/Resources/views/users/permissions/index.blade.php b/Resources/views/users/permissions/index.blade.php index 8e370df..c01c3cf 100644 --- a/Resources/views/users/permissions/index.blade.php +++ b/Resources/views/users/permissions/index.blade.php @@ -3,6 +3,14 @@ @endphp + @section('title') + Permissions + @endsection + + @section('breadcrumbs') + {{ Breadcrumbs::render('user-management.permissions.index') }} + @endsection + @@ -39,6 +47,8 @@ Export Report + Add {{ str_replace('-',' ',$route[1]) }} + + @section('title') + Roles + @endsection + + @section('breadcrumbs') + {{ Breadcrumbs::render('user-management.roles.index') }} + @endsection @@ -39,6 +46,8 @@ Export Report + Add {{ str_replace('-',' ',$route[1]) }} + + @section('title') + Users + @endsection + + @section('breadcrumbs') + {{ Breadcrumbs::render('user-management.index') }} + @endsection + @@ -32,13 +40,12 @@ - - Export Report + Add {{ str_replace('-',' ',$route[1]) }} Dashboard > User Management + Breadcrumbs::for('user-management.index', function (BreadcrumbTrail $trail) { + $trail->parent('dashboard'); + $trail->push('User Management', route('user.users.index')); + }); + + // Home > Dashboard > User Management > Users + Breadcrumbs::for('user-management.users.index', function (BreadcrumbTrail $trail) { + $trail->parent('user-management.index'); + $trail->push('Users', route('user.users.index')); + }); + + // Home > Dashboard > User Management > Users > [User] + Breadcrumbs::for('user-management.users.show', function (BreadcrumbTrail $trail, User $user) { + $trail->parent('user-management.users.index'); + $trail->push(ucwords($user->name), route('user.users.show', $user)); + }); + + // Home > Dashboard > User Management > Roles + Breadcrumbs::for('user-management.roles.index', function (BreadcrumbTrail $trail) { + $trail->parent('user-management.index'); + $trail->push('Roles', route('user.roles.index')); + }); + + // Home > Dashboard > User Management > Roles > [Role] + Breadcrumbs::for('user-management.roles.show', function (BreadcrumbTrail $trail, Role $role) { + $trail->parent('user-management.roles.index'); + $trail->push(ucwords($role->name), route('user.roles.show', $role)); + }); + + // Home > Dashboard > User Management > Permission + Breadcrumbs::for('user-management.permissions.index', function (BreadcrumbTrail $trail) { + $trail->parent('user-management.index'); + $trail->push('Permissions', route('user.permissions.index')); + }); +