solved issuis from Bulk Review v3,v4

This commit is contained in:
Milos Holba
2020-12-19 15:12:56 +01:00
parent 55cf58fffd
commit 65624326c7
17 changed files with 195 additions and 111 deletions

View File

@@ -96,16 +96,16 @@ class ShareController extends Controller
*/
public function destroy(Request $request)
{
foreach($request->input('tokens') as $folder) {
foreach($request->input('tokens') as $token) {
// Get sharing record
Share::where('token', $folder['token'])
Share::where('token', $token)
->where('user_id', Auth::id())
->firstOrFail()
->delete();
// Get zip record
$zip = Zip::where('shared_token', $folder['token'])
$zip = Zip::where('shared_token', $token)
->where('user_id', Auth::id())
->first();

View File

@@ -196,13 +196,11 @@ class User extends Authenticatable
public function getFolderTreeAttribute()
{
// Get sorting setup
$sort = strtolower(request()->input('sort'));
$direction = strtolower(request()->input('direction'));
return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('parent_id', 0)
->where('user_id', $this->id)
->sortable($sort , $direction)
->sortable()
->get();
}