From 976ed34442aa6c6261e88c8c99af6a5ab84dc119 Mon Sep 17 00:00:00 2001 From: Benjamin Becker <benjamin.becker@dataport.de> Date: Mon, 28 Feb 2022 11:05:35 +0000 Subject: [PATCH] allows licenseAttributionByText for licenses that don't require it --- ckanext/odsh/tests_tpsh/test_validation.py | 15 ++++++--------- ckanext/odsh/validation.py | 4 ---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ckanext/odsh/tests_tpsh/test_validation.py b/ckanext/odsh/tests_tpsh/test_validation.py index d4273be8..2e3c5e7e 100644 --- a/ckanext/odsh/tests_tpsh/test_validation.py +++ b/ckanext/odsh/tests_tpsh/test_validation.py @@ -63,15 +63,12 @@ class Test_validate_licenseAttributionByText(WithFrontendValidationMocks): data_mock.update({ ('license_id',): u'http://dcat-ap.de/def/licenses/dl-zero-de/2.0', }) - with nt.assert_raises(toolkit.Invalid) as err: - validate_licenseAttributionByText( - self.key_mock, - data_mock, - self.error_mock, - self.context_mock - ) - nt.assert_equal( - err.exception.error, 'licenseAttributionByText: text not allowed for this license') + validate_licenseAttributionByText( + self.key_mock, + data_mock, + self.error_mock, + self.context_mock + ) class Test_validate_extra_groupsFrontend(WithFrontendValidationMocks): diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index 54361f32..5817fa64 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -166,10 +166,6 @@ def validate_licenseAttributionByText(key, data, errors, context): raise toolkit.Invalid( 'licenseAttributionByText: empty not allowed') - if (not isByLicense) and hasAttribution: - raise toolkit.Invalid( - 'licenseAttributionByText: text not allowed for this license') - def _isByLicense(data): register = model.Package.get_license_register() -- GitLab