From 1721563a5f0ef733731275a236cb5ac3fc34a9f6 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 4 Dec 2023 18:28:08 +0100 Subject: [PATCH] Photoshop: Fix removed unsupported Path (#5996) * Fix removed unsupported Path Path is not json serializable by default, it is not necessary, better model reused. * Fix wrong key Must be 'path', not 'template_path' as workfile builder expects the former one. --- .../server/settings/workfile_builder.py | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/server_addon/photoshop/server/settings/workfile_builder.py b/server_addon/photoshop/server/settings/workfile_builder.py index ec2ee136ad..68db05270d 100644 --- a/server_addon/photoshop/server/settings/workfile_builder.py +++ b/server_addon/photoshop/server/settings/workfile_builder.py @@ -1,31 +1,18 @@ from pydantic import Field -from pathlib import Path -from ayon_server.settings import BaseSettingsModel - - -class PathsTemplate(BaseSettingsModel): - windows: Path = Field( - '', - title="Windows" - ) - darwin: Path = Field( - '', - title="MacOS" - ) - linux: Path = Field( - '', - title="Linux" - ) +from ayon_server.settings import BaseSettingsModel, MultiplatformPathModel class CustomBuilderTemplate(BaseSettingsModel): + _layout = "expanded" task_types: list[str] = Field( default_factory=list, title="Task types", ) - template_path: PathsTemplate = Field( - default_factory=PathsTemplate + + path: MultiplatformPathModel = Field( + default_factory=MultiplatformPathModel, + title="Template path" ) @@ -37,5 +24,6 @@ class WorkfileBuilderPlugin(BaseSettingsModel): ) custom_templates: list[CustomBuilderTemplate] = Field( - default_factory=CustomBuilderTemplate + default_factory=CustomBuilderTemplate, + title="Template profiles" )