fix: weird config.get() bug w/ default values

digitalmethodsinitiative · Oct 31, 2024 · dcc0a21 · dcc0a21
1 parent 80dfced
commit dcc0a21
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/common/config_manager.py b/common/config_manager.py
@@ -269,11 +269,11 @@ def get(self, attribute_name, default=None, is_json=False, user=None, tags=None)
 
             if not is_json and value is not None:
                 value = json.loads(value)
-            # TODO: check this as it feels like it could cause a default to return even if value is not None. - Dale
-            elif default is not None:
-                value = default
+            # TODO: Which default should have priority? The provided default feels like it should be the highest priority, but I think that is an old implementation and perhaps should be removed. - Dale
             elif value is None and setting_name in self.config_definition and "default" in self.config_definition[setting_name]:
                 value = self.config_definition[setting_name]["default"]
+            elif value is None and default is not None:
+                value = default
 
             final_settings[setting_name] = value