Changeset 0df7a93 for app

Timestamp:

10/24/21 20:55:11 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

7043def

Parents:

e0d3f94

Message:

bug fixes

Location:

app

Files:

• Http/Controllers/Dashboard/UsersController.php (modified) (3 diffs)
• Models/Department.php (modified) (1 diff)
• Models/User.php (modified) (1 diff)

app/Http/Controllers/Dashboard/UsersController.php

@@ -8 +8 @@
 use App\Http\Requests\Dashboard\UpdateUserRequest;
 use App\Models\Avatar;
+use App\Models\Department;
+use App\Models\Folder;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\File;
@@ -26 +28 @@
             "users" => User::all(),
             "roles" => Role::all(),
+            "adminAndReferents" => User::where("role_id", 1)->orWhere("role_id", 2)->get()
         ]);
     }
@@ -138 +141 @@
         $user = User::find($id);
 
-        $user->userProfile->delete();
-        $user->delete();
+        if(Folder::where('user_id', $user->id)->count() == 0) {
+            if (Storage::disk("uploads")->exists("users" . DIRECTORY_SEPARATOR . $user->avatar)) {
+                Storage::disk("uploads")->delete("users" . DIRECTORY_SEPARATOR . $user->avatar);
+            }
 
-        Alert::flash($user->name . " deleted successfully");
+            $user->delete();
 
-        return redirect()->route("dashboard.users.index");
+            Alert::flash($user->name . " deleted successfully");
+
+            return redirect()->route("dashboard.users.index");
+        }
+        else {
+            Alert::flash($user->name . "has associated folders");
+
+            return redirect()->back();
+        }
     }
 

app/Models/Department.php

@@ -28 +28 @@
         return $this->hasMany(Folder::class);
     }
+
+//    public function getDeptId(){
+//        return Department::where('id', $this->id)->get();
+//    }
 }

app/Models/User.php

@@ -134 +134 @@
         return User::where('id', $this->created_by)->pluck('username')->first();
     }
+
+    public function folder() {
+        return $this->hasMany(Folder::class);
+    }
 }