ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-01-31 10:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix project should not be merged into itself

Browse Source
This commit is contained in:
allegroai 2022-02-13 19:18:08 +02:00
parent a08fa9a0e1
commit 3d046ac282
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apiserver/bll/project/project_bll.py
View File

@ -57,10 +57,14 @@ class ProjectBLL:
with TimingContext("mongo", "move_project"): with TimingContext("mongo", "move_project"):
if source_id == destination_id: if source_id == destination_id:
raise errors.bad_request.ProjectSourceAndDestinationAreTheSame( raise errors.bad_request.ProjectSourceAndDestinationAreTheSame(
parent=source_id source=source_id
) )
source = Project.get(company, source_id) source = Project.get(company, source_id)
destination = Project.get(company, destination_id) destination = Project.get(company, destination_id)
if source_id in destination.path:
raise errors.bad_request.ProjectCannotBeMergedIntoItsChild(
source=source_id, destination=destination_id
)
children = _get_sub_projects( children = _get_sub_projects(
[source.id], _only=("id", "name", "parent", "path") [source.id], _only=("id", "name", "parent", "path")
@ -140,7 +144,14 @@ class ProjectBLL:
raise errors.bad_request.ProjectSourceAndDestinationAreTheSame( raise errors.bad_request.ProjectSourceAndDestinationAreTheSame(
location=new_parent.name if new_parent else "" location=new_parent.name if new_parent else ""
) )
if (
new_parent
and project_id == new_parent.id
or project_id in new_parent.path
):
raise errors.bad_request.ProjectCannotBeMovedUnderItself(
project=project_id, parent=new_parent.id
)
moved = _reposition_project_with_children( moved = _reposition_project_with_children(
project, children=children, parent=new_parent project, children=children, parent=new_parent
) )