Skip to content
Snippets Groups Projects
Commit 0bc671c4 authored by Thorge Petersen's avatar Thorge Petersen
Browse files

Merge branch...

Merge branch '76-harvested-datasets-require-category-despite-ckanext-odsh-require_at_least_one_category-set-to' into 'dev'

Resolve "Harvested Datasets Require Category Despite `ckanext.odsh.require_at_least_one_category` Set to `false`"

See merge request !56
parents 671c3339 3a7412d5
Branches
Tags
1 merge request!56Resolve "Harvested Datasets Require Category Despite `ckanext.odsh.require_at_least_one_category` Set to `false`"
...@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Corrected `_parse_distributions` of `ODSHDCATdeProfile` to not rely on resource dict, fixing missing `id` errors. - Corrected `_parse_distributions` of `ODSHDCATdeProfile` to not rely on resource dict, fixing missing `id` errors.
- Resolved an issue where harvested datasets were incorrectly required to have a category set, even when the configuration variable `ckanext.odsh.require_at_least_one_category` was set to false.
## [2.5.0] - 2025-01-30 ## [2.5.0] - 2025-01-30
......
...@@ -32,7 +32,7 @@ def validate_extra_groups(data, requireAtLeastOne, errors): ...@@ -32,7 +32,7 @@ def validate_extra_groups(data, requireAtLeastOne, errors):
log.debug("Validating extra_groups") log.debug("Validating extra_groups")
value = _extract_value(data, 'groups') value = _extract_value(data, 'groups')
error_message_no_group = 'at least one group needed' error_message_no_group = 'at least one group needed'
if value != None: if value is not None:
# 'value != None' means the extra key 'groups' was found, # 'value != None' means the extra key 'groups' was found,
# so the dataset came from manual editing via the web-frontend. # so the dataset came from manual editing via the web-frontend.
if not value: if not value:
...@@ -55,7 +55,7 @@ def validate_extra_groups(data, requireAtLeastOne, errors): ...@@ -55,7 +55,7 @@ def validate_extra_groups(data, requireAtLeastOne, errors):
data[('groups', num, 'id')] = group data[('groups', num, 'id')] = group
else: # no extra-field 'groups' else: # no extra-field 'groups'
# dataset might come from a harvest process # dataset might come from a harvest process
if not data.get(('groups', 0, 'id'), False) and \ if requireAtLeastOne and not data.get(('groups', 0, 'id'), False) and \
not data.get(('groups', 0, 'name'), False): not data.get(('groups', 0, 'name'), False):
errors['groups'] = error_message_no_group errors['groups'] = error_message_no_group
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment