Merge branch 'master' into healthdcat_ap

ckan · Dec 4, 2024 · d9818fa · d9818fa
2 parents 4458afe + 81a85cc
commit d9818fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,6 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.ckan-image }}
+      options: --user root
     services:
       solr:
         image: ckan/ckan-solr:${{ matrix.ckan-version }}-solr9

diff --git a/ckanext/dcat/schemas/dcat_ap_full.yaml b/ckanext/dcat/schemas/dcat_ap_full.yaml
@@ -261,6 +261,13 @@ dataset_fields:
   validators: ignore_missing scheming_multiple_text
   help_text: The legislation that mandates the creation or management of the dataset.
 
+- field_name: has_version
+  label: Has version
+  preset: multiple_text
+  validators: ignore_missing scheming_multiple_text
+  help_inline: true
+  help_text: This property refers to a related Dataset that is a version, edition, or adaptation of the described Dataset.
+
 #- field_name: hvd_category
 #  label: HVD Category
 #  preset: multiple_text
@@ -351,13 +358,6 @@ resource_fields:
   label: License
   help_text: License in which the resource is made available. If not provided will be inherited from the dataset.
 
-- field_name: has_version
-  label: Has version
-  preset: multiple_text
-  validators: ignore_missing scheming_multiple_text
-  help_inline: true
-  help_text: This property refers to a related Dataset that is a version, edition, or adaptation of the described Dataset.
-
   # Note: this falls back to the standard resource url field
 - field_name: access_url
   label: Access URL