nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-15 17:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

added it_remove_folder_from_favourites, it_delete_multiple_folder_hardly

Browse Source
This commit is contained in:
Peter Papp
2021-02-27 11:03:04 +01:00
parent 5225673163
commit 97ade6c238
5 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/FileFunctions/FavouriteController.php
+4 -4
View File
@@ -43,10 +43,10 @@ class FavouriteController extends Controller
/**
* Remove folder from user favourites
*
* @param $unique_id
* @param $id
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
*/
public function destroy($unique_id)
public function destroy($id)
{
// Get user
$user = Auth::user();
@@ -56,9 +56,9 @@ class FavouriteController extends Controller
}
// Remove folder from user favourites
$user->favourite_folders()->detach($unique_id);
$user->favourite_folders()->detach($id);
// Return updated favourites
return $user->favourite_folders;
return response($user->favourite_folders, 204);
}
}
app/Http/Tools/Editor.php
+8 -9
View File
@@ -5,7 +5,7 @@ namespace App\Http\Tools;
use App;
use App\Models\Folder;
use App\Models\Share;
use App\File as UserFile;
use App\Models\File as UserFile;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Models\User;
use App\Models\Zip;
@@ -295,14 +295,14 @@ class Editor
$shared->delete();
}
// Remove folder from user favourites
DB::table('favourite_folder')
->where('folder_id', $folder->id)
->delete();
// Soft delete items
if (! $item['force_delete']) {
// Remove folder from user favourites
DB::table('favourite_folder')
->where('folder_id', $folder->id)
->delete();
// Soft delete folder record
$folder->delete();
}
@@ -311,12 +311,11 @@ class Editor
if ($item['force_delete']) {
// Get children folder ids
$child_folders = filter_folders_ids($folder->trashed_folders, 'unique_id');
$child_folders = filter_folders_ids($folder->trashed_folders, 'id');
// Get children files
$files = UserFile::onlyTrashed()
->where('user_id', $user->id)
->whereIn('folder_id', Arr::flatten([$unique_id, $child_folders]))
->whereIn('folder_id', Arr::flatten([$id, $child_folders]))
->get();
// Remove all children files