From 9582f2703e3c19859ecc069acb233d5aa7e9f985 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 12 Jul 2023 14:01:08 +0700 Subject: [PATCH] update usermanager --- DataTables/PermissionsDataTable.php | 2 +- Database/Seeders/PermissionGroupSeeder.php | 8 ++++++-- .../Auth/AuthenticatedSessionController.php | 15 ++++++++++++++- Resources/views/auth/login-usermanager.blade.php | 10 ---------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/DataTables/PermissionsDataTable.php b/DataTables/PermissionsDataTable.php index 6cc2aa2..6ba3716 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 '-'; }) ->addColumn('role', function (PermissionGroup $model) { $role = $model->roles($model); diff --git a/Database/Seeders/PermissionGroupSeeder.php b/Database/Seeders/PermissionGroupSeeder.php index 9c720d7..69a3889 100644 --- a/Database/Seeders/PermissionGroupSeeder.php +++ b/Database/Seeders/PermissionGroupSeeder.php @@ -18,7 +18,7 @@ foreach ($data as $value) { PermissionGroup::updateOrCreate([ - 'name' => $value['name'] + 'name' => $value['name'] ]); } } @@ -28,7 +28,11 @@ return [ ['name' => 'User'], ['name' => 'Role'], - ['name' => 'Permission'] + ['name' => 'Permission'], + ['name' => 'Operator'], + ['name' => 'Otorisator'], + ['name' => 'Kepala Divisi'], + ['name' => 'Kepala Bagian'] ]; } } diff --git a/Http/Controllers/Auth/AuthenticatedSessionController.php b/Http/Controllers/Auth/AuthenticatedSessionController.php index a988208..a070c5a 100644 --- a/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -6,6 +6,7 @@ use App\Providers\RouteServiceProvider; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; + use Modules\Usermanager\Entities\User; use Modules\Usermanager\Http\Requests\LoginRequest; class AuthenticatedSessionController extends Controller @@ -19,7 +20,11 @@ { addJavascriptFile('assets/js/custom/authentication/sign-in/general.js'); - return view('usermanager::auth.login'); + if($_ENV['METHOD_AUTH']=='usermanager'){ + return view('usermanager::auth.login-usermanager'); + }else{ + return view('usermanager::auth.login'); + } } /** @@ -70,10 +75,18 @@ case '001' : $user->assignRole('administrator'); break; + case '002' : + $user->assignRole('kepaladivisi'); + break; + case '003' : + $user->assignRole('kepalabagian'); + break; case '007' : + case '018' : $user->assignRole('operator'); break; case '008' : + case '019' : $user->assignRole('otorisator'); break; default : diff --git a/Resources/views/auth/login-usermanager.blade.php b/Resources/views/auth/login-usermanager.blade.php index 056901e..0858805 100644 --- a/Resources/views/auth/login-usermanager.blade.php +++ b/Resources/views/auth/login-usermanager.blade.php @@ -53,16 +53,6 @@ - - -
- Not a Member yet? - - - Sign up - -
-