|
@@ -28,7 +28,7 @@ class FolderController extends Controller
|
|
{
|
|
{
|
|
$folderObjectType = FolderObjectType::from($objectType);
|
|
$folderObjectType = FolderObjectType::from($objectType);
|
|
|
|
|
|
- $object=$folderObjectType->modelBuilderAllowed()->findOrFail($objectId);
|
|
|
|
|
|
+ $object=$folderObjectType->modelBuilderAllowed()->with(['library'])->findOrFail($objectId);
|
|
|
|
|
|
$folders = Folder::query()
|
|
$folders = Folder::query()
|
|
->where([
|
|
->where([
|
|
@@ -51,10 +51,19 @@ class FolderController extends Controller
|
|
$folders->uniId=$folders->type.'_'.$folders->id;
|
|
$folders->uniId=$folders->type.'_'.$folders->id;
|
|
});
|
|
});
|
|
|
|
|
|
|
|
+ $container=[
|
|
|
|
+ 'id'=>$object->id,
|
|
|
|
+ 'name'=>$object->name,
|
|
|
|
+ 'naming_rule_id'=>$object->naming_rule_id,
|
|
|
|
+ 'naming_rules'=>$object->naming_rules,
|
|
|
|
+ 'object_type'=>$object->library->type,
|
|
|
|
+ 'asset_id'=>$object->library->asset_id,
|
|
|
|
+ 'project_id'=>$object->library->project_id,
|
|
|
|
+ ];
|
|
|
|
|
|
return $this->success([
|
|
return $this->success([
|
|
//'data' => make_tree($folders->toArray(), \request("parent_id", 0)),
|
|
//'data' => make_tree($folders->toArray(), \request("parent_id", 0)),
|
|
- 'object'=>$object->get(['id','name','naming_rule_id','naming_rules']),
|
|
|
|
|
|
+ 'object'=> $container,
|
|
'data' => $folders
|
|
'data' => $folders
|
|
]);
|
|
]);
|
|
}
|
|
}
|
|
@@ -253,7 +262,7 @@ class FolderController extends Controller
|
|
|
|
|
|
$folderObjectType = FolderObjectType::from($objectType);
|
|
$folderObjectType = FolderObjectType::from($objectType);
|
|
|
|
|
|
- $object=$folderObjectType->modelBuilderAllowed()->findOrFail($objectId);
|
|
|
|
|
|
+ $object=$folderObjectType->modelBuilderAllowed()->with(['library'])->findOrFail($objectId);
|
|
|
|
|
|
|
|
|
|
$objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
|
|
$objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
|
|
@@ -302,9 +311,19 @@ class FolderController extends Controller
|
|
$file->display_id=$folderCount++;
|
|
$file->display_id=$folderCount++;
|
|
});
|
|
});
|
|
|
|
|
|
|
|
+ $container=[
|
|
|
|
+ 'id'=>$object->id,
|
|
|
|
+ 'name'=>$object->name,
|
|
|
|
+ 'naming_rule_id'=>$object->naming_rule_id,
|
|
|
|
+ 'naming_rules'=>$object->naming_rules,
|
|
|
|
+ 'object_type'=>$object->library->type,
|
|
|
|
+ 'asset_id'=>$object->library->asset_id,
|
|
|
|
+ 'project_id'=>$object->library->project_id,
|
|
|
|
+ ];
|
|
|
|
+
|
|
|
|
|
|
return $this->success([
|
|
return $this->success([
|
|
- 'object'=>$object->get(['id','name','naming_rule_id','naming_rules']),
|
|
|
|
|
|
+ 'object'=>$container,
|
|
'data' => [
|
|
'data' => [
|
|
'folders' => $folders,
|
|
'folders' => $folders,
|
|
'files' => FileByObjectResource::collection($files),
|
|
'files' => FileByObjectResource::collection($files),
|