mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-29 23:44:41 +00:00
fakeRenameFileOrFolder fixes
This commit is contained in:
@@ -2,7 +2,9 @@
|
|||||||
namespace Domain\Items\Controllers;
|
namespace Domain\Items\Controllers;
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use Domain\Files\Models\File;
|
||||||
use Domain\Files\Resources\FileResource;
|
use Domain\Files\Resources\FileResource;
|
||||||
|
use Domain\Folders\Models\Folder;
|
||||||
use Domain\Folders\Resources\FolderResource;
|
use Domain\Folders\Resources\FolderResource;
|
||||||
use Domain\Items\Requests\RenameItemRequest;
|
use Domain\Items\Requests\RenameItemRequest;
|
||||||
use Domain\Items\Actions\RenameFileOrFolderAction;
|
use Domain\Items\Actions\RenameFileOrFolderAction;
|
||||||
@@ -27,9 +29,15 @@ class RenameFileOrFolderController extends Controller
|
|||||||
public function __invoke(
|
public function __invoke(
|
||||||
RenameItemRequest $request,
|
RenameItemRequest $request,
|
||||||
string $id,
|
string $id,
|
||||||
): FileResource | FolderResource | array {
|
): FileResource | FolderResource | File | Folder | array {
|
||||||
if (is_demo_account()) {
|
if (is_demo_account()) {
|
||||||
return ($this->fakeRenameFileOrFolder)($request, $id);
|
$item = ($this->fakeRenameFileOrFolder)($request, $id);
|
||||||
|
|
||||||
|
if ($request->input('type') === 'folder') {
|
||||||
|
return new FolderResource($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FileResource($item);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If request contain icon or color, then change it
|
// If request contain icon or color, then change it
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class FakeRenameFileOrFolderAction
|
|||||||
public function __invoke(
|
public function __invoke(
|
||||||
RenameItemRequest $request,
|
RenameItemRequest $request,
|
||||||
string $id,
|
string $id,
|
||||||
): array {
|
): array|File|Folder {
|
||||||
// Get item
|
// Get item
|
||||||
if ($request->input('type') === 'folder') {
|
if ($request->input('type') === 'folder') {
|
||||||
$item = Folder::where('id', $id)
|
$item = Folder::where('id', $id)
|
||||||
@@ -25,8 +25,10 @@ class FakeRenameFileOrFolderAction
|
|||||||
|
|
||||||
if ($item) {
|
if ($item) {
|
||||||
$item->name = $request->input('name');
|
$item->name = $request->input('name');
|
||||||
$item->emoji = $request->input('icon.emoji') ?? null;
|
|
||||||
$item->color = $request->input('icon.color') ?? null;
|
if ($request->has('emoji')) {
|
||||||
|
$item->emoji = $request->input('emoji');
|
||||||
|
}
|
||||||
|
|
||||||
return $item;
|
return $item;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user