diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py index 4b9b7ce200264f4f6ef1fd3d82b16d904ecd14ae..cb900c99e35f3a1ecc8b003074140f6d1b1d9be6 100644 --- a/ckanext/odsh/validation.py +++ b/ckanext/odsh/validation.py @@ -64,12 +64,13 @@ def validate_extra_groups(data, requireAtLeastOne, errors): def validate_extras(key, data, errors, context): extra_errors = {} - isStaNord = ('id',) in data and data[('id',)][:7] == 'StaNord' - isLVermGeo = ('owner_org',) in data and data[('owner_org',)] == '01115337-01d1-4e96-aa8e-9749524889c7' - isUmweltportal = ('owner_org',) in data and data[('owner_org',)] == '09871195-cd0a-4767-9396-276404c940d9' + harvesting = ('ignore_auth' in context) and (context['ignore_auth'] == True) + owner_org = data[('owner_org',)] + lenient_with = config.get('ckanext.odsh.lenient_with','') + is_optional_temporal_start = toolkit.asbool( config.get('ckanext.odsh.is_optional_temporal_start', False) - ) or isStaNord or isLVermGeo or isUmweltportal + ) ( harvesting and (owner_org in lenient_with) ) require_at_least_one_category = toolkit.asbool( config.get('ckanext.odsh.require_at_least_one_category', False)