diff options
Diffstat (limited to 'moon_manager/moon_manager')
| -rw-r--r-- | moon_manager/moon_manager/__init__.py | 2 | ||||
| -rw-r--r-- | moon_manager/moon_manager/api/json_import.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/moon_manager/moon_manager/__init__.py b/moon_manager/moon_manager/__init__.py index af7fced5..98a98146 100644 --- a/moon_manager/moon_manager/__init__.py +++ b/moon_manager/moon_manager/__init__.py @@ -3,4 +3,4 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -__version__ = "4.5.0" +__version__ = "4.5.1" diff --git a/moon_manager/moon_manager/api/json_import.py b/moon_manager/moon_manager/api/json_import.py index a048baee..58ee526b 100644 --- a/moon_manager/moon_manager/api/json_import.py +++ b/moon_manager/moon_manager/api/json_import.py @@ -188,19 +188,20 @@ class JsonImport(Resource): JsonUtils.copy_field_if_exists(json_item_data, json_to_use, "description", str) json_policy = dict() # field_mandatory : not mandatory if there is some mandatory policies - JsonUtils.convert_name_to_id(json_item_data, json_policy, "policy", "policy_id", "policy", + JsonUtils.convert_names_to_ids(json_item_data, json_policy, "policies", "policy_id", "policy", PolicyManager, self._user_id, field_mandatory=len(mandatory_policy_ids) == 0) logger.info("json_policy {}".format(json_policy)) json_category = dict() JsonUtils.convert_name_to_id(json_item_data, json_category, "category", "category_id", type_element+"_category", ModelManager, self._user_id) logger.info("json_category {}".format(json_category)) - policy_id = None + policy_ids = [] if "policy_id" in json_policy: - policy_id = json_policy["policy_id"] + policy_ids = json_policy["policy_id"] - if policy_id is not None and policy_id not in mandatory_policy_ids: - mandatory_policy_ids.append(policy_id) + for policy_id in policy_ids: + if policy_id is not None and policy_id not in mandatory_policy_ids: + mandatory_policy_ids.append(policy_id) if len(mandatory_policy_ids) == 0: raise InvalidJson("Invalid data, the policy shall be set when importing {}".format(json_item_data)) |