Skip to content
Snippets Groups Projects
Commit 6950d9cc authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

Merge branch 'dev' into 'master'

fixed errors in validate_extras

See merge request !28
parents 94b37e1d 51e3366f
No related branches found
No related tags found
4 merge requests!38Merge py3 into dev,!33Resolve "Angabe zum Musterdatensatz beim DCAT-Harvesting übernehmen",!31Revert "Merge branch '31-return-404-on-missing-resource-type' into 'v1.3'",!28fixed errors in validate_extras
...@@ -64,13 +64,14 @@ def validate_extra_groups(data, requireAtLeastOne, errors): ...@@ -64,13 +64,14 @@ def validate_extra_groups(data, requireAtLeastOne, errors):
def validate_extras(key, data, errors, context): def validate_extras(key, data, errors, context):
extra_errors = {} extra_errors = {}
isStaNord = ('id',) in data and data[('id',)][:7] == 'StaNord'
harvesting = ('ignore_auth' in context) and (context['ignore_auth'] == True) harvesting = ('ignore_auth' in context) and (context['ignore_auth'] == True)
owner_org = data[('owner_org',)] owner_org = data[('owner_org',)]
lenient_with = config.get('ckanext.odsh.lenient_with','') lenient_with = config.get('ckanext.odsh.lenient_with','')
is_optional_temporal_start = toolkit.asbool( is_optional_temporal_start = toolkit.asbool(
config.get('ckanext.odsh.is_optional_temporal_start', False) config.get('ckanext.odsh.is_optional_temporal_start', False)
) ( harvesting and (owner_org in lenient_with) ) ) or ( harvesting and (owner_org in lenient_with) )
require_at_least_one_category = toolkit.asbool( require_at_least_one_category = toolkit.asbool(
config.get('ckanext.odsh.require_at_least_one_category', False) config.get('ckanext.odsh.require_at_least_one_category', False)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment