From 0f22fe6daf8ec55f32d78587f4d72922ad2a9903 Mon Sep 17 00:00:00 2001 From: Aly Badr Date: Fri, 13 Dec 2019 09:32:08 +0100 Subject: [PATCH] circulation policy: ignore settings when deleting a policy * Fixes an issue when cipo settings blocked its deletion. * Closes rero/rero-ils-ui#76 Co-Authored-by: Aly Badr --- rero_ils/modules/circ_policies/api.py | 3 --- tests/api/test_circ_policies_rest.py | 7 +++---- tests/ui/circ_policies/test_circ_policies_api.py | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rero_ils/modules/circ_policies/api.py b/rero_ils/modules/circ_policies/api.py index e4a3437564..6bcae1c7cb 100644 --- a/rero_ils/modules/circ_policies/api.py +++ b/rero_ils/modules/circ_policies/api.py @@ -208,9 +208,6 @@ def reasons_to_keep(self): is_default = self.get('is_default') if is_default: others['is_default'] = is_default - has_settings = self.get('settings') - if has_settings: - others['has_settings'] = has_settings return others def get_links_to_me(self): diff --git a/tests/api/test_circ_policies_rest.py b/tests/api/test_circ_policies_rest.py index c6f4b135e7..47608c8695 100644 --- a/tests/api/test_circ_policies_rest.py +++ b/tests/api/test_circ_policies_rest.py @@ -308,12 +308,11 @@ def test_circ_policy_secure_api_delete(client, record_url = url_for('invenio_records_rest.cipo_item', pid_value=circ_policy_short_martigny.pid) - with pytest.raises(IlsRecordError.NotDeleted): - res = client.delete(record_url) - assert res.status_code == 200 + res = client.delete(record_url) + assert res.status_code == 204 # Sion login_user_via_session(client, librarian_sion_no_email.user) res = client.delete(record_url) - assert res.status_code == 403 + assert res.status_code == 410 diff --git a/tests/ui/circ_policies/test_circ_policies_api.py b/tests/ui/circ_policies/test_circ_policies_api.py index 0b14d6127b..5cf0f7b3f7 100644 --- a/tests/ui/circ_policies/test_circ_policies_api.py +++ b/tests/ui/circ_policies/test_circ_policies_api.py @@ -111,8 +111,7 @@ def test_circ_policy_can_not_delete(circ_policy_default_martigny, others = circ_policy_short_martigny.reasons_to_keep() assert 'is_default' not in others - assert not circ_policy_short_martigny.can_delete - assert others['has_settings'] + assert circ_policy_short_martigny.can_delete def test_circ_policy_can_delete(app, circ_policy_martigny_data_tmp):