Merge pull request #165 from mjanez/ckan-2.10.5

Minor fixes

.env.example

@@ -195,7 +195,7 @@ CKANEXT__DCAT__DEFAULT_CATALOG_ENDPOINT='/catalog.{_format}'
 CKANEXT__SPATIAL__SEARCH_BACKEND=solr-spatial-field
 CKAN__SPATIAL__SRID=3857
 CKANEXT__SPATIAL__COMMON_MAP__TYPE=custom
-CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=http://a.tile.openstreetmap.org/{z}/{x}/{y}.png
+CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=https://a.tile.openstreetmap.org/{z}/{x}/{y}.png
 CKANEXT__SPATIAL__COMMON_MAP__ATTRIBUTION='Map tiles by <a href="http://openstreetmap.org">OpenStreetMap</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>)'
 
 # ckanext-geoview

.github/workflows/docker-build.yml

@@ -82,6 +82,9 @@ jobs:
 
       - name: Run Trivy container image vulnerability scanner
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
           format: sarif

.github/workflows/docker-manual.yml

@@ -72,6 +72,9 @@ jobs:
 
       - name: Run Trivy container image vulnerability scanner
         uses: aquasecurity/[email protected]
+        env:
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
         with:
           image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
           format: sarif

ckan/patches/ckanext-pages/01_org_group_templates.patch

@@ -13,6 +13,19 @@ index bbdae8f..6bf00fa 100644
 +    {{ h.build_nav_icon('group_pages_index', _('Pages'), id=group_dict.name, icon='file') }}
    {% endif %}
  {% endblock %}
+diff --git a/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html b/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html
+index 6ab5f92..c00e1d6 100644
+--- a/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html
++++ b/ckanext/pages/theme/templates_main/ckanext_pages/confirm_delete.html
+@@ -10,7 +10,7 @@
+       {% block form %}
+       <p>{{ _('Are you sure you want to delete page - {name}?').format(name=c.page_dict.name) }}</p>
+       <p class="form-actions">
+-      {% set action = form_action or h.url_for('organization_pages_delete', id=c.group_dict.name, page='/' + page) %}
++      {% set action = form_action or h.url_for('organization_pages_delete', id=group_dict.name, page='/' + page) %}
+       <form action="{{ action }}" method="post">
+         <button class="btn" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+         <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
 diff --git a/ckanext/pages/theme/templates_organization/organization/read_base.html b/ckanext/pages/theme/templates_organization/organization/read_base.html
 index e5f3b47..eb2f39b 100644
 --- a/ckanext/pages/theme/templates_organization/organization/read_base.html

samples/.env.codespaces

@@ -198,7 +198,7 @@ CKANEXT__DCAT__DEFAULT_CATALOG_ENDPOINT='/catalog.{_format}'
 CKANEXT__SPATIAL__SEARCH_BACKEND=solr-spatial-field
 CKAN__SPATIAL__SRID=3857
 CKANEXT__SPATIAL__COMMON_MAP__TYPE=custom
-CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=http://a.tile.openstreetmap.org/{z}/{x}/{y}.png
+CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=https://a.tile.openstreetmap.org/{z}/{x}/{y}.png
 CKANEXT__SPATIAL__COMMON_MAP__ATTRIBUTION='Map tiles by <a href="http://openstreetmap.org">OpenStreetMap</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>)'
 
 # ckanext-geoview

samples/.env.dev.example

@@ -196,7 +196,7 @@ CKANEXT__DCAT__DEFAULT_CATALOG_ENDPOINT='/catalog.{_format}'
 CKANEXT__SPATIAL__SEARCH_BACKEND=solr-spatial-field
 CKAN__SPATIAL__SRID=3857
 CKANEXT__SPATIAL__COMMON_MAP__TYPE=custom
-CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=http://a.tile.openstreetmap.org/{z}/{x}/{y}.png
+CKANEXT__SPATIAL__COMMON_MAP__CUSTOM__URL=https://a.tile.openstreetmap.org/{z}/{x}/{y}.png
 CKANEXT__SPATIAL__COMMON_MAP__ATTRIBUTION='Map tiles by <a href="http://openstreetmap.org">OpenStreetMap</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>)'
 
 # ckanext-geoview