diff --git a/gns3server/api/routes/controller/projects.py b/gns3server/api/routes/controller/projects.py index 45f725a87..99861230c 100644 --- a/gns3server/api/routes/controller/projects.py +++ b/gns3server/api/routes/controller/projects.py @@ -123,8 +123,7 @@ async def create_project( controller = Controller.instance() project_dict = jsonable_encoder(project_data, exclude_unset=True) - if "created_by" not in project_dict: - project_dict["created_by"] = current_user.username + project_dict["created_by"] = current_user.username project = await controller.add_project(**project_dict) return project.asdict() diff --git a/gns3server/schemas/controller/projects.py b/gns3server/schemas/controller/projects.py index 8b01009a3..711eabb6b 100644 --- a/gns3server/schemas/controller/projects.py +++ b/gns3server/schemas/controller/projects.py @@ -64,7 +64,6 @@ class ProjectBase(BaseModel): show_interface_labels: Optional[bool] = Field(None, description="Show interface labels on the drawing area") supplier: Optional[Supplier] = Field(None, description="Supplier of the project") variables: Optional[List[Variable]] = Field(None, description="Variables required to run the project") - created_by: Optional[str] = Field(None, description="Username of the user who created the project") class ProjectCreate(ProjectBase): @@ -97,6 +96,7 @@ class Project(ProjectBase): name: Optional[str] = None status: Optional[ProjectStatus] = None filename: Optional[str] = None + created_by: Optional[str] = Field(None, description="Username of the user who created the project") class ProjectFile(BaseModel): diff --git a/tests/controller/test_topology.py b/tests/controller/test_topology.py index 3cf554dc8..9e1f72f82 100644 --- a/tests/controller/test_topology.py +++ b/tests/controller/test_topology.py @@ -59,7 +59,8 @@ async def test_project_to_topology_empty(tmpdir): "type": "topology", "supplier": None, "variables": None, - "version": __version__ + "version": __version__, + "created_by": None }