From 86cd60c1a063f2f4e9637d8b9be22bb040f621d3 Mon Sep 17 00:00:00 2001 From: Jordan Blasenhauer Date: Tue, 23 Jul 2024 12:06:14 +0200 Subject: [PATCH] better raw mode script --- src/ui/builder.py | 12 +++++------- src/ui/client/tests/globalconfig.py | 13 +++++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/ui/builder.py b/src/ui/builder.py index c3dffc56f..7e2a4504b 100644 --- a/src/ui/builder.py +++ b/src/ui/builder.py @@ -269,13 +269,11 @@ def set_raw(template: list, plugins_base: list, settings: dict) -> dict: # Then override by service settings if setting in settings: - val = settings[setting].get("value", value.get("value")) - - # Check if value is same as default - # If case, we don't need to add it - default_val = value.get("default") - if val == default_val: - raw_value = None + # Check if the service setting is not default value to add it + default_val = value.get("default") + val = settings[setting].get("value", value.get("value", value.get("default"))) + if val != default_val: + raw_value = val # Add value only if exists if raw_value: diff --git a/src/ui/client/tests/globalconfig.py b/src/ui/client/tests/globalconfig.py index 6728515f8..f3f01178c 100644 --- a/src/ui/client/tests/globalconfig.py +++ b/src/ui/client/tests/globalconfig.py @@ -3408,14 +3408,11 @@ def set_raw(template: list, plugins_base: list, settings: dict) -> dict: # Then override by service settings if setting in settings: - val = settings[setting].get("value", value.get("value")) - - - # Check if value is same as default - # If case, we don't need to add it - default_val = value.get("default") - if val == default_val: - raw_value = None + # Check if the service setting is not default value to add it + default_val = value.get("default") + val = settings[setting].get("value", value.get("value", value.get("default"))) + if val != default_val: + raw_value = val # Add value only if exists if raw_value: