From b0d8667d97278ce15f5c603503dc3630a8eaed8e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 6 May 2021 09:54:39 +0200 Subject: [PATCH 1/3] sort applications values for custom attribute by label --- openpype/modules/ftrack/lib/custom_attributes.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openpype/modules/ftrack/lib/custom_attributes.py b/openpype/modules/ftrack/lib/custom_attributes.py index 33eea32baa0..abff1e61940 100644 --- a/openpype/modules/ftrack/lib/custom_attributes.py +++ b/openpype/modules/ftrack/lib/custom_attributes.py @@ -15,12 +15,17 @@ def default_custom_attributes_definition(): def app_definitions_from_app_manager(app_manager): - app_definitions = [] + _app_definitions = [] for app_name, app in app_manager.applications.items(): if app.enabled and app.is_host: - app_definitions.append({ - app_name: app.full_label - }) + _app_definitions.append( + (app_name, app.full_label) + ) + + # Sort items by label + app_definitions = [] + for key, label in sorted(_app_definitions, key=lambda item: item[1]): + app_definitions.append({key: label}) if not app_definitions: app_definitions.append({"empty": "< Empty >"}) From 75d7cd16adfc9ad69a2303bed405c8d6aef9499c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 6 May 2021 09:54:49 +0200 Subject: [PATCH 2/3] sort tools values for custom attribute by label --- openpype/modules/ftrack/lib/custom_attributes.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/openpype/modules/ftrack/lib/custom_attributes.py b/openpype/modules/ftrack/lib/custom_attributes.py index abff1e61940..f6b82c90b1a 100644 --- a/openpype/modules/ftrack/lib/custom_attributes.py +++ b/openpype/modules/ftrack/lib/custom_attributes.py @@ -33,11 +33,16 @@ def app_definitions_from_app_manager(app_manager): def tool_definitions_from_app_manager(app_manager): - tools_data = [] + _tools_data = [] for tool_name, tool in app_manager.tools.items(): - tools_data.append({ - tool_name: tool.label - }) + _tools_data.append( + (tool_name, tool.label) + ) + + # Sort items by label + tools_data = [] + for key, label in sorted(_tools_data, key=lambda item: item[1]): + tools_data.append({key: label}) # Make sure there is at least one item if not tools_data: From 9cacf4e0f5265bcd0924b76a6d978684e5df2022 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 6 May 2021 09:57:14 +0200 Subject: [PATCH 3/3] fix mtoa 3.1 label in defaults --- openpype/settings/defaults/system_settings/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/system_settings/tools.json b/openpype/settings/defaults/system_settings/tools.json index b0adccc65e7..181236abe83 100644 --- a/openpype/settings/defaults/system_settings/tools.json +++ b/openpype/settings/defaults/system_settings/tools.json @@ -32,7 +32,7 @@ }, "__dynamic_keys_labels__": { "3-2": "3.2", - "3-1": "3.2" + "3-1": "3.1" } } },