From 482781d6c60d54955d0db871e3d9b7563d91433a Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Mon, 3 Jun 2024 12:12:02 -0400 Subject: [PATCH] Moved lesser-used label prefixes for Gitea into a new setting subcategory. --- Scripts/server_gitea_api.gd | 8 ++++---- bugbot.gd | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Scripts/server_gitea_api.gd b/Scripts/server_gitea_api.gd index a3c82f8..de9057c 100644 --- a/Scripts/server_gitea_api.gd +++ b/Scripts/server_gitea_api.gd @@ -88,11 +88,11 @@ func __prepare_form_thread(callback:Callable) -> void: tag_lists[BugbotTagArray.OS] = Array() tag_lists[BugbotTagArray.COMPONENT] = Array() tag_lists[BugbotTagArray.SEVERITY] = Array() - var version_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/version_label_prefix", DEFAULT_VERSION_LABEL_PREFIX) - var hardware_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/hardware_label_prefix", DEFAULT_HARDWARE_LABEL_PREFIX) - var os_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/os_label_prefix", DEFAULT_OS_LABEL_PREFIX) - var component_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/component_label_prefix", DEFAULT_COMPONENT_LABEL_PREFIX) var priority_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/priority_label_prefix", DEFAULT_PRIORITY_LABEL_PREFIX) + var version_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/optional_labels/version_label_prefix", DEFAULT_VERSION_LABEL_PREFIX) + var hardware_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/optional_labels/hardware_label_prefix", DEFAULT_HARDWARE_LABEL_PREFIX) + var os_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/optional_labels/os_label_prefix", DEFAULT_OS_LABEL_PREFIX) + var component_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/optional_labels/component_label_prefix", DEFAULT_COMPONENT_LABEL_PREFIX) response_data.sort_custom(func(a,b):return a["id"] < b["id"]) for label_in:Dictionary in response_data: diff --git a/bugbot.gd b/bugbot.gd index f333d7d..3524b59 100644 --- a/bugbot.gd +++ b/bugbot.gd @@ -65,12 +65,12 @@ func __initialise_project_settings() -> void: __add_project_setting("bugbot/reporting/gitea/status_labels/unresolved_statuses", TYPE_ARRAY, Array(), PROPERTY_HINT_ARRAY_TYPE, &"21/:") __add_project_setting("bugbot/reporting/gitea/status_labels/in_progress_statuses", TYPE_ARRAY, Array(), PROPERTY_HINT_ARRAY_TYPE, &"21/:") __add_project_setting("bugbot/reporting/gitea/status_labels/resolved_statuses", TYPE_ARRAY, Array(), PROPERTY_HINT_ARRAY_TYPE, &"21/:") - __add_project_setting("bugbot/reporting/gitea/status_labels/version_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_VERSION_LABEL_PREFIX) - __add_project_setting("bugbot/reporting/gitea/status_labels/hardware_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_HARDWARE_LABEL_PREFIX) - __add_project_setting("bugbot/reporting/gitea/status_labels/os_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_OS_LABEL_PREFIX) - __add_project_setting("bugbot/reporting/gitea/status_labels/component_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_COMPONENT_LABEL_PREFIX) __add_project_setting("bugbot/reporting/gitea/status_labels/priority_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_PRIORITY_LABEL_PREFIX) __add_project_setting("bugbot/reporting/gitea/status_labels/show_assigned_as_in_progress", TYPE_BOOL, BugbotServerGiteaAPI.DEFAULT_SHOW_ASSIGNED_AS_IN_PROGRESS) + __add_project_setting("bugbot/reporting/gitea/optional_labels/version_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_VERSION_LABEL_PREFIX) + __add_project_setting("bugbot/reporting/gitea/optional_labels/hardware_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_HARDWARE_LABEL_PREFIX) + __add_project_setting("bugbot/reporting/gitea/optional_labels/os_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_OS_LABEL_PREFIX) + __add_project_setting("bugbot/reporting/gitea/optional_labels/component_label_prefix", TYPE_STRING, BugbotServerGiteaAPI.DEFAULT_COMPONENT_LABEL_PREFIX) #endregion #region Jira __add_project_setting("bugbot/reporting/jira/server", TYPE_STRING, BugbotServerJiraAPI.DEFAULT_SERVER)