nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/version-v1.8.1' into version-v1.8.1

Browse Source
This commit is contained in:
Peter Papp
2021-01-17 13:30:27 +01:00
parent e0f192777f ce1bad57cd
commit 973b301a46
14 changed files with 37324 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/FileFunctions/EditItemsController.php
View File

@@ -115,6 +115,12 @@ class EditItemsController extends Controller
}
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('folder_icon')) {
Editor::set_folder_icon($request->folder_icon, $unique_id);
}
// Rename Item
return Editor::rename_item($request, $unique_id);
}
@@ -151,6 +157,12 @@ class EditItemsController extends Controller
Guardian::check_item_access($item->folder_id, $shared);
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('folder_icon')) {
Editor::set_folder_icon($request->folder_icon, $unique_id, $shared);
}
// Rename item
$item = Editor::rename_item($request, $unique_id, $shared);

33
app/Http/Tools/Editor.php
View File

@@ -26,6 +26,39 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
class Editor
{
/**
* Store folder icon
*
* @param $folder_iconL
* @param $unique_id
* @param $shared
*/
public static function set_folder_icon ($folder_icon, $unique_id, $shared = null)
{
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
// Get folder
$folder = FileManagerFolder::where('user_id', $user_id)
->where('unique_id', $unique_id)
->first();
// If request have emoji set folder icon emoji
if(isset($folder_icon['emoji'])) {
$folder->folder_icon_emoji = $folder_icon['emoji'];
$folder->folder_icon_color = null;
}
// If request have color set folder icon color
if(isset($folder_icon['color'])) {
$folder->folder_icon_emoji = null;
$folder->folder_icon_color = $folder_icon['color'];
}
// Save changes
$folder->save();
}
/**
* Zip requested folder
*