fix: correcting test failures and various formatting issues

Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com>
oscal-compass · Sep 7, 2023 · e6134af · e6134af
1 parent deca2f5
commit e6134af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/trestle/core/catalog/catalog_reader.py b/trestle/core/catalog/catalog_reader.py
@@ -74,11 +74,10 @@ def read_additional_content(
                     param_dict[const.VALUES] = param_dict[const.VALUES] if const.VALUES in param_dict else []
                     # if profile_values are present, overwrite values with them
                     if const.PROFILE_VALUES in param_dict:
-                        if not write_mode and '<REPLACE_ME>' in param_dict[const.PROFILE_VALUES]:
-                            param_dict[const.PROFILE_VALUES].remove('<REPLACE_ME>')
-                        param_dict[const.VALUES] = param_dict[const.PROFILE_VALUES
-                                                              ] if param_dict[const.PROFILE_VALUES
-                                                                              ] != [] else param_dict[const.VALUES]
+                        if param_dict[const.PROFILE_VALUES] != [] and param_dict[const.PROFILE_VALUES] is not None:
+                            if not write_mode and '<REPLACE_ME>' in param_dict[const.PROFILE_VALUES]:
+                                param_dict[const.PROFILE_VALUES].remove('<REPLACE_ME>')
+                            param_dict[const.VALUES] = param_dict[const.PROFILE_VALUES]
                         if not write_mode:
                             param_dict.pop(const.PROFILE_VALUES)
                     final_param_dict[param_id] = param_dict

diff --git a/trestle/core/commands/author/profile.py b/trestle/core/commands/author/profile.py
@@ -269,6 +269,7 @@ def _replace_modify_set_params(
                     new_set_params.append(
                         prof.SetParameter(
                             param_id=key,
+                            label=param.label,
                             values=param.values,
                             select=param.select,
                             props=param.props