|
@@ -314,8 +314,11 @@ class FolderController extends Controller
|
|
|
*/
|
|
|
public function changeName(UpdateRequest $request,string $id){
|
|
|
$newName=$request->name;
|
|
|
- $folders=Folder::query()->where('parent_id',$request->parent_id)->pluck('name');
|
|
|
$folder=Folder::query()->findOrFail($id);
|
|
|
+ $objectWhere = [
|
|
|
+ 'object_type' => $folder->object_type, 'object_id' => $folder->object_id
|
|
|
+ ];
|
|
|
+ $folders=Folder::query()->where('parent_id',$request->parent_id,$objectWhere)->pluck('name');
|
|
|
if($folders->contains($newName)&&$newName!=$folder->name){
|
|
|
return $this->badRequest("Folder '%s' must be unique", $newName);
|
|
|
}else{
|