diff --git a/Database/Migrations/2014_10_12_000000_create_users_table.php b/Database/Migrations/2014_10_12_000000_create_users_table.php
index e3dbe16..d51e598 100644
--- a/Database/Migrations/2014_10_12_000000_create_users_table.php
+++ b/Database/Migrations/2014_10_12_000000_create_users_table.php
@@ -15,8 +15,6 @@ return new class extends Migration
{
Schema::create('users', function (Blueprint $table) {
$table->id();
- $table->foreignIdFor('Modules\Cetaklabel\Entities\Directorat', 'directorat_id')->nullable();
- $table->foreignIdFor('Modules\Cetaklabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable();
$table->string('name');
$table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable();
diff --git a/Entities/User.php b/Entities/User.php
index a39f469..337b394 100644
--- a/Entities/User.php
+++ b/Entities/User.php
@@ -24,9 +24,7 @@
protected $fillable = [
'name',
'email',
- 'password',
- 'directorat_id',
- 'sub_directorat_id',
+ 'password'
];
/**
diff --git a/Http/Controllers/Users/UsersController.php b/Http/Controllers/Users/UsersController.php
index f5fe4cd..c1e61bd 100644
--- a/Http/Controllers/Users/UsersController.php
+++ b/Http/Controllers/Users/UsersController.php
@@ -8,7 +8,6 @@
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
- use Modules\Cetaklabel\Entities\Directorat;
use Modules\Usermanager\DataTables\UsersDataTable;
use Modules\Usermanager\Entities\User;
use Spatie\Permission\Models\Role;
@@ -39,9 +38,8 @@
addVendor('chained-select');
- $directorat = Directorat::all();
$roles = Role::all();
- return $dataTable->render('usermanager::users.users.index', compact('directorat', 'roles'));
+ return $dataTable->render('usermanager::users.users.index', compact( 'roles'));
}
/**
@@ -83,12 +81,10 @@
if ($validated) {
try {
// Create New User
- $user = new User();
- $user->name = $request->name;
- $user->email = $request->email;
- $user->directorat_id = $request->directorat_id;
- $user->sub_directorat_id = $request->sub_directorat_id;
- $user->password = Hash::make($request->password);
+ $user = new User();
+ $user->name = $request->name;
+ $user->email = $request->email;
+ $user->password = Hash::make($request->password);
$user->save();
@@ -159,9 +155,9 @@
*/
public function update(Request $request, $id)
{
- if (is_null($this->user) || !$this->user->can('user.update')) {
- abort(403, 'Sorry !! You are Unauthorized to update any users !');
- }
+ if (is_null($this->user) || !$this->user->can('user.update')) {
+ abort(403, 'Sorry !! You are Unauthorized to update any users !');
+ }
// Create New User
$user = User::find($id);
@@ -182,10 +178,8 @@
if ($validated) {
try {
- $user->name = $request->name;
- $user->email = $request->email;
- $user->directorat_id = $request->directorat_id;
- $user->sub_directorat_id = $request->sub_directorat_id;
+ $user->name = $request->name;
+ $user->email = $request->email;
if ($request->password) {
$user->password = Hash::make($request->password);
diff --git a/Resources/views/users/users/_form.blade.php b/Resources/views/users/users/_form.blade.php
index 388e766..bab9551 100644
--- a/Resources/views/users/users/_form.blade.php
+++ b/Resources/views/users/users/_form.blade.php
@@ -58,39 +58,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Resources/views/users/users/_table.blade.php b/Resources/views/users/users/_table.blade.php
index 62ff3fb..eef1735 100644
--- a/Resources/views/users/users/_table.blade.php
+++ b/Resources/views/users/users/_table.blade.php
@@ -68,8 +68,6 @@
success: function (response) {
console.log(response);
$('#title_form').text('Edit {{ ucfirst(str_replace('-',' ',$route[0].' '.$route[1])) }}');
- $('#directorat_id').val(response.data.directorat_id).change();
- $('#sub_directorat_id').val(response.data.directorat_id).change();
$('#{{$route[0].'_'.$route[1]}}_id').val(response.data.id);
$('#{{$route[0].'_'.$route[1]}}_name').val(response.data.name);
$('#{{$route[0].'_'.$route[1]}}_email').val(response.data.email);
diff --git a/Resources/views/users/users/index.blade.php b/Resources/views/users/users/index.blade.php
index a2d7e8e..a845a66 100644
--- a/Resources/views/users/users/index.blade.php
+++ b/Resources/views/users/users/index.blade.php
@@ -125,16 +125,10 @@
$('#kt_modal_user_users').on('hidden.bs.modal', function (e) {
$(".form_user_users")[0].reset();
- $("#sub_directorat_id").html("").append("");
$(".form_user_users").attr('action', "{{ route('user.users.store') }}");
$(".form_user_users").find('input[name="_method"]').remove();
$("#title_form").html("Create User");
});
-
- $("#sub_directorat_id").remoteChained({
- parents : "#directorat_id",
- url : "/sub-directorat"
- });
});
@endpush