Changeset ec7b69d for app/Http

Timestamp:

11/29/21 23:10:44 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

79aa35c

Parents:

dbc5976

Message:

added confirmation modal on userSettings

Location:

app/Http/Controllers/Dashboard

Files:

• FoldersController.php (modified) (1 diff)
• SettingsController.php (modified) (1 diff)

app/Http/Controllers/Dashboard/FoldersController.php

@@ -233 +233 @@
         $folder = Folder::find($id);
 
-        $existingFolders = Folder::where(['department_id' => $folder->department->id, 'name' => $folder->name, 'arch_id' => $folder->arch_id])->count();
-
-        if($existingFolders > 1 && $folder->version == 1) {
-            Alert::flash($folder->name . " has versions", "error");
+        $existingFolders = Folder::where(['department_id' => $folder->department->id, 'name' => $folder->name, 'arch_id' => $folder->arch_id]);
+
+        if($existingFolders->count() > 1 && $folder->version == 1 || $folder->version < $existingFolders->pluck('version')->max()) {
+            Alert::flash($folder->name . " has newer versions", "error");
             return redirect()->back();
         }

app/Http/Controllers/Dashboard/SettingsController.php

@@ -43 +43 @@
     }
 
-    public function updatePassword(UsernameSettingsRequest $request)
+    public function updatePassword(PasswordSettingsRequest $request)
     {
             $user = auth()->user();