From 8583263020bbe829fe471097799e31e09a6535f7 Mon Sep 17 00:00:00 2001 From: Tony Dorfmeister Date: Tue, 21 Jan 2025 17:30:14 +0100 Subject: [PATCH 1/2] gets EnumDef default for groups from default_values retrieved from server settings --- .../ayon_deadline/plugins/publish/global/collect_jobinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py b/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py index 52591a6232..289b39d9fa 100644 --- a/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py +++ b/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py @@ -293,13 +293,13 @@ def _get_artist_overrides(cls, overrides, profile): EnumDef( "primary_pool", label="Primary pool", - default="none", + default=default_values.get("primary_pool"), items=cls.pool_enum_values, ), EnumDef( "secondary_pool", label="Secondary pool", - default="none", + default=default_values.get("secondary_pool"), items=cls.pool_enum_values, ), EnumDef( From 00b319a9ce539196c7722d7452fceff2dac7ebcf Mon Sep 17 00:00:00 2001 From: Tony Dorfmeister Date: Wed, 22 Jan 2025 12:49:26 +0100 Subject: [PATCH 2/2] adds fallback to `none` if no corresponding default_value is found --- .../ayon_deadline/plugins/publish/global/collect_jobinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py b/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py index 289b39d9fa..b46504a170 100644 --- a/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py +++ b/client/ayon_deadline/plugins/publish/global/collect_jobinfo.py @@ -293,13 +293,13 @@ def _get_artist_overrides(cls, overrides, profile): EnumDef( "primary_pool", label="Primary pool", - default=default_values.get("primary_pool"), + default=default_values.get("primary_pool", "none"), items=cls.pool_enum_values, ), EnumDef( "secondary_pool", label="Secondary pool", - default=default_values.get("secondary_pool"), + default=default_values.get("secondary_pool", "none"), items=cls.pool_enum_values, ), EnumDef(