Changeset 28bab7b for app

Timestamp:

11/03/21 12:39:35 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

e3af09e

Parents:

3536fe9

Message:

added create version

Location:

app/Http/Controllers/Dashboard

Files:

• DepartmentsController.php (modified) (1 diff)
• FoldersController.php (modified) (2 diffs)

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -163 +163 @@
 
             else {
-            Alert::flash("All departments are empty", "warning");
+            Alert::flash("All folders are empty", "warning");
             return redirect()->back();
             }

app/Http/Controllers/Dashboard/FoldersController.php

@@ -119 +119 @@
         $existingFolder = Folder::where(['department_id' => $request->department, 'name' => $request->name, 'arch_id' => $request->arch_id])->count();
 
-        $existingFolderName = Folder::where(['department_id' => $request->department, 'name' => $request->name])->count();
-        $existingFolderArchId = Folder::where(['department_id' => $request->department, 'arch_id' => $request->arch_id])->count();
+        $existingFolderName = Folder::where(['department_id' => $request->department, 'name' => $request->name])->get();
+        $existingFolderArchId = Folder::where(['department_id' => $request->department, 'arch_id' => $request->arch_id])->get();
 
         if($existingFolder > 0) {
@@ -126 +126 @@
         }
 
-        if(($existingFolderName > 0 && $existingFolderArchId <= 0) || ($existingFolderName <= 0 && $existingFolderArchId > 0)) {
+        //dd($existingFolderName, $existingFolderArchId);
+
+        if(($existingFolderName->isNotEmpty() && $existingFolderArchId->isEmpty()) || ($existingFolderName->isEmpty() && $existingFolderArchId->isNotEmpty())) {
             Alert::flash("Can't create another version since folder name or archive ID is different", "error");