CKAN CIOOS v1.2 Release (#156)

* [docs-only] Override click version to avoid conflict

* [docs-only] Remove click version from other req files

* [docs-only] Remove click override

* Remove erroneous argument

`--config` isn't a valid option to `rebuild`

* Catch TypeError from invalid thrown by dateutils

Also provide better logs so that it is possible to identify the issue.

* Update search index date tests to throw TypeErrors

* Revert "Catch TypeError from invalid dates thrown by dateutils"

* Update version for 2.9.4b

* [ckan#5597] Fix DataPusher error during resource_update

Create local session in the DataPusher submit action and pass that to
task_status_update to avoid interferring with the overall
resource_update transaction.

See ckan#6137 for details

* Improve documentation: resource_patch

When someone reads "Uploading a new version of a resource file" is not expected that deletes all extras.

* [ckan#6113] Fix user email validator when using name as id parameter

CKAN 2.9 introduced the `email_is_unique` validator to prevent duplicates. But the
current implementation only works when the id param contains the actual UUID not
the name.

* Update ckan (paster) commands for ckan 2.9.x

* Update ckan (paster) commands for ckan 2.9.x

* [I18N] [FIX ckan#5586] Don't cache license translations across requests

* Licenses are read and cached in the package model
* Translate the license in the helper for each request.

* Use CKANRequest object implicitly in templates

* Test to ensure that we are using CKANRequest in templates

* fix test

* fix pep8 test...

* [ckan#5998] db init error in alembic

* ckan#6086 fix sqlalchemy configuration for datastore

* render activity timestamps with title= attribute

* Fixture for plugin DB migrations

* Remove unnecessary imports

* Add pending-migrations

* Drop extra tables after tests

* update argument

* Fix py3 security alerts

* Remove blogspam link from the documentation footer

* [ckan#6162] fix pagination links for custom org types

* [ckan#6179] Fix exception when using solr_user and solr_password on Py3

Fixes ckan#6179

Use the base64 module to encode the Solr Basic Auth header to avoid
bytes/str exception on Python 3

* [ckan#6179] Encoding definition

* [ckan#6181] Fix page render errors when search facets are not defined

* fix guard clause on has_more_facets, ckan#6190

* restore Page import so that other modules can refer to it via 'h.Page', ckan#6190

* [ckan#6207] Fix for g.__timer

* Remove not accessed user object

* Restore user object to _get_action

* Remove not accessed variables

* [ckan#2317] fix default ordering consuming resource content from datastore

* [ckan#2317] added changelog fragement

* [ckan#2317] made default sort by _id less aggressive

* [ckan#2317] restrict default order to non distinct case

* [2317] accepted proposed change in changelog

Co-authored-by: Ian Ward <[email protected]>

* [ckan#6159] Add and Update Docstring for existing functions

* Add doctring to `chained_action` function
* Update `chained_auth` docstring
* update `chained_helper` docstring

* solve conflict

* fix pep8 error

* update `chained_helper` and `chain_action` doctsting

* Fix documentation typo

* [ckan#6270] Typo in default_package_sort config example

* DataPusher and XLoader documented in Source docs

* Update install-from-source.rst

* fixes HTTP basic auth cred handling

* [ckan#6319] Fix datetime formatting when listing user tokens on py2.

* Fix typo

* coerce query string keys/values before passing to quote()

* ensure fallback behaviour matches default

* remove unused import

* reversed function used

* failing test case for validation error list position

* Revert "[ckan#4801] Simplify even more the erros handling in navl"

This reverts commit 7b6702b.

* Revert "[ckan#4801] Refactor processing of errors in NAVL"

This reverts commit a632078.

* Revert "[ckan#4801] Refactor processing of errors in NAVL"

This reverts commit a632078.

* Remove valid lists from error output, add tests

* [ckan#6340] Handle Traceback Exception for HTTP and HTTP status Code in logging

The traceback for HTTP Exception will be added only when debug is true

* [ckan#6340] Add the changelog

* [ckan#6340] Coding Standard

* [ckan#6340] Change the error level to debug/info

* fix for render_datetime

* [ckan#6051] Allow UTF-8 in JS translations

See issue ckan#6051

* Fix runaway preview height

* Fix unpriviledged users being able to access bulk process

Any user was able to access and view the bulk process page for organization
management. This fix checks access and returns unauthorized exception
if theuser shouldn't be there.

* Move auth check to _prepare method

Previously implementation only worked for GET requests, now works with
GET and POST requests

* Use bulk_update_public to check access

Was using group_update. Also removed duplicate check from POST request

* Update tests

* fixing access atom feed for a deleted organization

* fixing access atom feed for a deleted group

* Call to defaul action to allow links to be opened in new tab

* Switch to JQuery recommended method

* [ckan#6051] Py2/py3 compatible version of open

* Remove leftover paste import

* Coding standards

* Rebuild requirements.txt to sync it with requirements.in

* Fix io.open call in lib/i18n.py

* Pin watchdog on py3 so it installs a compatible version

* Use codecs instead of io

* Fix bad merge of ckan#6149

* Rename lib/io.py module which was giving problems

* Rename __init__.py file in extension

* Show job title on job start/finish log messages

To make it easier to debug background job calls.

Before:

```
INFO  [ckan.lib.jobs] Worker rq:worker:f0792c8bd67344f288b5704d39c43124 starts job 2baa42e5-4582-4103-92e5-b4a384d0b1da from queue "default"
```

After:

```
INFO  [ckan.lib.jobs] Worker rq:worker:f0792c8bd67344f288b5704d39c43124 starts job 2baa42e5-4582-4103-92e5-b4a384d0b1da (Process data fields) from queue "default"
```

* Add missing __init__.py file

* String literals

* snippet names rendered in non-debug mode

* Update changelog for 2.9.4

* Build frontend

* [i18n] Pull po files from Transifex

* [i18n] Compile mo files

* Upgrade version for 2.9.4

* Update version for 2.9.5b

* Consistent cli behavior

* pep8

* Py2 compatible fix for ckan#6135

* [ckan#6390] fix user create/edit email validators

* Allow strict types for user/group uploads

CKAN 2.9 specific changes when cherry-picking:

* Replace f-strings with .format()
* Don't use faker / Pillow for tests, as there is no faker fixture in
the Python 2 version

* Add changelog entry for group image types

* Move type verification into upload method

* Fix APIToken CLI test

* Update docs

* Link to config options from changelog

* Allow children for select2

* Fix children type

* [ckan#6531] Py2/py3 compatible version of open

* Add select2 features

* Undo change

* Replace f-string

* Fix standards

* [ckan#6530] Add Solr 8 support

* Set logging level to error in error mail handler

* Add RootPathMiddleware to flask stack to support non-root installs running on python 3

* Add previously removed RootPathMiddleware back to common middleware as it is still needed

* Added utility functions for common CKAN admin commands.

* Use correct auth function when editing organizations

* [ckan#5820] fix invite user with existing email error

* Fix regression when validating resource subfields (by @TomeCirun)

* [ckan#6408] Add timeout param to request get calls (by @EricSoroos)

* [ckan#6408] Document new options

* Accept empty string in one of validator

* Negate empty string check

* Fix pep8

* [i18n] Pull translation from Transifex

* [i18n] Compile mo files

* Compile frontend

* Small fix adding virtual env path to ckan command.

* Update changelog before 2.9.5

* Include the Solr 8 schema file in the 2.9 branch

* Update version for 2.9.5

* Updates to ckan_utils.sh.

* move spatial harvester into ckanext-cioos_harvest extension and allow POST requests to the spatial search api endpoint in the spatial api

* document spatil harvester config

* update submodules

* create dev branch in submodules and update

* add compile css command

* upgrade solr to 8.11.1

* update

* update all submodules to latest dev version

* update submodules again

* update schema

* Updated submodule contrib/docker/src/ckanext-cioos_theme

* Updated submodule contrib/docker/src/ckanext-spatial

* fix a few integration bugs

* update

* Updated submodule contrib/docker/src/ckanext-cioos_theme

* update translations

* fix bugs, update logos

* Updated submodule contrib/docker/src/ckanext-scheming

* add atlantic eov icons

* Updated submodule contrib/docker/src/ckanext-cioos_theme

* add collapsed option to indicate how truncated fields initially load

* add wasRevisionOf to schema.org profile output

* release all submodules -  merge dev into main

* remove geoview pip file from dockerfile

Co-authored-by: amercader <[email protected]>
Co-authored-by: Chris Wood <[email protected]>
Co-authored-by: Ken Tsang <[email protected]>
Co-authored-by: Jari Voutilainen <[email protected]>
Co-authored-by: Guillermo Ferrer Bosque <[email protected]>
Co-authored-by: Carlo Cancellieri <[email protected]>
Co-authored-by: Eric Soroos <[email protected]>
Co-authored-by: Alexandr Cherniavskyi <[email protected]>
Co-authored-by: etj <[email protected]>
Co-authored-by: chris48s <[email protected]>
Co-authored-by: Sergey Motornyuk <[email protected]>
Co-authored-by: robbi5 <[email protected]>
Co-authored-by: ThrawnCA <[email protected]>
Co-authored-by: pdelboca <[email protected]>
Co-authored-by: Christian Buck <[email protected]>
Co-authored-by: wrinklenose <[email protected]>
Co-authored-by: Ian Ward <[email protected]>
Co-authored-by: steveoni <[email protected]>
Co-authored-by: Andres Vazquez <[email protected]>
Co-authored-by: Gauravp-NEC <[email protected]>
Co-authored-by: Erin Doherty <[email protected]>
Co-authored-by: Niall McAndrew <[email protected]>
Co-authored-by: Sunny-NEC <[email protected]>
Co-authored-by: Shubham Mahajan <[email protected]>
Co-authored-by: Tome Cirun <[email protected]>
Co-authored-by: jescgom <[email protected]>
Co-authored-by: franz osorio <[email protected]>
Co-authored-by: Dan Mihaila <[email protected]>
Co-authored-by: Francesco Frassinelli <[email protected]>
Co-authored-by: Teemu Erkkola <[email protected]>
Co-authored-by: Jeff Cullis <[email protected]>

.gitignore

@@ -73,3 +73,7 @@ contrib/docker/src/OWSLib
 contrib/docker/src/ckanext-repeating
 
 contrib/docker/src/ckanext-composite
+
+ckan/i18n/zh_Hant_TW/LC_MESSAGES/ckan.po
+
+ckan/i18n/zh_Hant_TW/LC_MESSAGES/ckan.mo

CHANGELOG.rst

@@ -9,6 +9,82 @@ Changelog
 
 .. towncrier release notes start
 
+v.2.9.5 2022-01-19
+==================
+
+
+Major features
+--------------
+
+- Solr 8 support. Starting from version 2.9.5, CKAN supports Solr versions 6 and 8. Support for Solr 6 will be dropped in the next
+  CKAN minor version (2.10). Note that if you want to use Solr 8 you need to use the ``ckan/config/solr/schema.solr8.xml`` file, or
+  alternatively you can use the ``ckan/ckan-solr:2.9-solr8`` Docker image which comes pre-configured. (`#6530 <https://github.com/ckan/ckan/pull/6530>`_)
+
+
+Bugfixes
+--------
+
+- Consistent CLI behavior when no command is provided and when using `--help` (`#6120 <https://github.com/ckan/ckan/pull/6120>`_)
+- Fix regression when validating resource subfields (`#6546 <https://github.com/ckan/ckan/pull/6546>`_)
+- Fix user create/edit email validators (`#6399 <https://github.com/ckan/ckan/pull/6399>`_)
+- Error opening JS translations on Python 2 (`#6531 <https://github.com/ckan/ckan/pull/6531>`_)
+- Set logging level to error in error mail handler (`#6577 <https://github.com/ckan/ckan/pull/6577>`_)
+- Add RootPathMiddleware to flask stack to support non-root installs running on python 3 (`#6556 <https://github.com/ckan/ckan/pull/6577>`_)
+- Use correct auth function when editing organizations (`#6622 <https://github.com/ckan/ckan/pull/6622>`_)
+- Fix invite user with existing email error (`#5880 <https://github.com/ckan/ckan/pull/5880>`_)
+- Accept empty string in one of validator (`#6612 <https://github.com/ckan/ckan/pull/6612>`_)
+
+
+Minor changes
+-------------
+
+- Add timeouts to requests calls (see :ref:`ckan.requests.timeout`) (`#6408 <https://github.com/ckan/ckan/pull/6408>`_)
+- Types of file uploads for group and user imags can be restricted via the `ckan.upload.{object_type}.types` and `ckan.upload.{object_type}.mimetypes`  config options (eg :ref:`ckan.upload.group.types`,  :ref:`ckan.upload.user.mimetypes`) (`#6477 <https://github.com/ckan/ckan/pull/6477>`_)
+- Allow children elements on select2 lists (`#6503 <https://github.com/ckan/ckan/pull/6503>`_)
+- Enable ``minimumInputLength`` and fix loading message in select2 (`#6554 <https://github.com/ckan/ckan/pull/6554>`_)
+
+
+
+v.2.9.4 2021-09-22
+==================
+
+Note: This release includes requirements upgrades to address security issues
+
+
+Bugfixes
+--------
+
+- Don't show snippet names in non-debug mode (`#6406 <https://github.com/ckan/ckan/pull/6406>`_)
+- Show job title on job start/finish log messages (`#6387 <https://github.com/ckan/ckan/pull/6387>`_)
+- Fix unpriviledged users being able to access bulk process (`#6290 <https://github.com/ckan/ckan/pull/6290>`_)
+- Allow UTF-8 in JS translations (`#6051 <https://github.com/ckan/ckan/pull/6051>`_)
+- Handle Traceback Exception for HTTP and HTTP status Code in logging (`#6340 <https://github.com/ckan/ckan/pull/6340>`_)
+- Fix object list validation output (`#6149 <https://github.com/ckan/ckan/pull/6149>`_)
+- Coerce query string keys/values before passing to quote() (`#6099 <https://github.com/ckan/ckan/pull/6099>`_)
+- Fix datetime formatting when listing user tokens on py2. (`#6319 <https://github.com/ckan/ckan/pull/6319>`_)
+- Fix Solr HTTP basic auth cred handling (`#6286 <https://github.com/ckan/ckan/pull/6286>`_)
+- Remove not accessed user object in resource_update (`#6220 <https://github.com/ckan/ckan/pull/6220>`_)
+- Fix for g.__timer (`#6207 <https://github.com/ckan/ckan/pull/6207>`_)
+- Fix guard clause on has_more_facets, #6190 (`#6190 <https://github.com/ckan/ckan/pull/6190>`_)
+- Fix page render errors when search facets are not defined (`#6181 <https://github.com/ckan/ckan/pull/6181>`_)
+- Fix exception when using solr_user and solr_password on Py3 (`#6179 <https://github.com/ckan/ckan/pull/6179>`_)
+- Fix pagination links for custom org types (`#6162 <https://github.com/ckan/ckan/pull/6162>`_)
+- Fixture for plugin DB migrations (`#6139 <https://github.com/ckan/ckan/pull/6139>`_)
+- Render activity timestamps with title= attribute (`#6109 <https://github.com/ckan/ckan/pull/6109>`_)
+- Fix db init error in alembic (`#5998 <https://github.com/ckan/ckan/pull/5998>`_)
+- Fix user email validator when using name as id parameter (`#6113 <https://github.com/ckan/ckan/pull/6113>`_)
+- Fix DataPusher error during resource_update (`#5597 <https://github.com/ckan/ckan/pull/5597>`_)
+- render_datetime helper does not respect ckan.display_timezone configuration (`#6252 <https://github.com/ckan/ckan/pull/6252>`_)
+- Fix SQLAlchemy configuration for DataStore (`#6087 <https://github.com/ckan/ckan/pull/6086>`_)
+- Don't cache license translations across requests (`#5586 <https://github.com/ckan/ckan/pull/5586>`_)
+- Fix tracking.js module preventing links to be opened in new tabs (`#6386 <https://github.com/ckan/ckan/pull/6384>`_)
+- Fix deleted org/group feeds (`#6368 <https://github.com/ckan/ckan/pull/6368>`_)
+- Fix runaway preview height (`#6284 <https://github.com/ckan/ckan/pull/6283>`_)
+- Stable default ordering when consuming resource content from datastore
+  (`#2317 <https://github.com/ckan/ckan/pull/2317>`_)
+- Several documentation fixes and improvements
+
+
 v.2.9.3 2021-05-19
 ==================
 

Dockerfile

@@ -116,9 +116,6 @@ chmod +x /wait-for-postgres.sh
 # Copy extensions into container and Install
 RUN  chown -R ckan:ckan $CKAN_HOME $CKAN_VENV $CKAN_CONFIG $CKAN_STORAGE_PATH
 
-COPY ./contrib/docker/src/ckanext-geoview/pip-requirements.txt $CKAN_VENV/src/ckanext-geoview/pip-requirements.txt
-RUN /bin/bash -c "source $CKAN_VENV/bin/activate && cd $CKAN_VENV/src && ckan-pip install -r ckanext-geoview/pip-requirements.txt"
-
 COPY ./contrib/docker/src/ckanext-dcat/requirements.txt $CKAN_VENV/src/ckanext-dcat/requirements.txt
 RUN /bin/bash -c "source $CKAN_VENV/bin/activate && cd $CKAN_VENV/src && ckan-pip install -r ckanext-dcat/requirements.txt"
 

FEATURES.md

@@ -1,2 +1,68 @@
 
-- sitemap (/sitemap/sitemap.xml) and robots.txt
+# Search Engines
+- sitemap (/sitemap/sitemap.xml)
+- robots.txt
+
+# Harvesting
+
+## CKAN Harvester Type
+
+config settings
+- api_key: api token of a registered user on the ckan being harvested from.
+  allows harvesting private datasets
+- organizations_filter_include: list (['strings']) - list organizations to include in the harvest
+- organizations_filter_exclude: list (['strings']) - list organizations to exclude from the harvest
+- groups_filter_include: list (['strings']) - list groups to include in the harvest
+- groups_filter_exclude: list (['strings']) - list groups to exclude from the harvest
+- field_filter_include: list ([{field:"", value:""}]) - list of fields and values to filter datasets by for including in harvest
+- field_filter_exclude: list ([{field:"", value:""}]) - list of fields and values to filter datasets by for excluding from harvest
+
+- clean_tags: munge tags to remove special characters
+- force_all: boolean (true|false) - force harvester to gather all datasets even if the dataset was not updated since the last time the harvester was run. only datasets whos content have changed will be updated.
+force_package_type
+
+- default_tags: list - Set default tags if needed eg: ['waf', 'test']
+- remote_groups: string ('only_local'|'create') -  populate group if exists,
+  create remote groups, or nothing
+- remote_orgs: string ('only_local'|'create') - same as above but for
+  organizations. If organization can not be determined from dataset it falls
+  back to the organization that owns the harvester.
+- default_groups: list
+- default_extras: dictinary
+- override_extras: (default: False)
+
+## CKAN Spatial Harvester Type
+This is a custom harvester that allows harvesting datasets from a remote ckan
+instance who's spatial geomitry intersects with a given polygon, multipolygon,
+or bbox.
+
+when using ckan spatial harvester the following harvester config settings are available, these are in adition to the ckan harvester config settings:
+
+- spatial_filter_file: Path, relative to the src folder, to a file containing well known text formated polygons eg "./pacific_RA.wkt"
+- spatial_filter: same as above but a literal text string in well know text format.
+- spatial_crs: define the crs of the spatial coordinates (default: 4326)
+
+note that when using the ckan spatial harvester, the catalogue you are harvesting
+from must have implomented our modified /api/2/search/dataset/geo endpoint to
+allow searching by polygon. The default endpoint only allows searching using
+bounding box.
+
+# Menu
+it is now possible to sync the menu items from a compatible wordpress site, into ckan. The wordpress instance must imploment the following endpoints
+```
+/wp-json/ra/menu/en
+/wp-json/ra/menu/fr
+```
+
+To use, first set the 'Custome Header Filename' config option to the appropriate value, for example `/menu/pacific_menu_list.html`.  If you are using an existing file then you could stop there. CKAN will pull the menu items from the appropriate template in the /menu/ folder.
+
+To sync menu items from a wordpress site we run the `menu create` CLI command.
+
+## CLI Command Usage
+```
+ckan  menu create --url [path to wordpress api endpoint] --output [output menu list file (default: /menu/menu_list.html)]
+```
+## Example
+```
+sudo docker exec -u root -it ckan  ckan --config /etc/ckan/production.ini menu create --url https://cioospacific.ca/wp-json/ra/menu/ --output /menu/pacific_menu_list.html
+```

INSTALL_CIOOS_CKAN.md

@@ -616,7 +616,7 @@ This method uses dockers copy command to copy the new schema file into a running
 
 ```bash
 cd ~/ckan
-sudo docker cp ~/ckan/ckan/config/solr/schema.xml solr:/opt/solr/server/solr/ckan/conf
+sudo docker cp ~/ckan/ckan/config/solr/schema.xml solr:/opt/solr/server/solr/configsets/ckan/conf/managed-schema
 ```
 
 Restart solr container
@@ -636,6 +636,17 @@ sudo docker exec -it ckan ckan --config=/etc/ckan/production.ini search-index re
 
 If you need to update CKAN to a new version you can either remove the docker_ckan_home volume or update the volume with the new ckan core files. After which you need to rebuild the CKAN image and any docker containers based on that image. If you are working with a live / production system the preferred method is to update the volume and rebuild which will result in the least amount of down time.
 
+enable volume environment variables to make accessing the volumes easier
+
+```bash
+export VOL_CKAN_HOME=`sudo docker volume inspect docker_ckan_home | jq -r -c '.[] | .Mountpoint'`
+export VOL_CKAN_CONFIG=`sudo docker volume inspect docker_ckan_config | jq -r -c '.[] | .Mountpoint'`
+export VOL_CKAN_STORAGE=`sudo docker volume inspect docker_ckan_storage | jq -r -c '.[] | .Mountpoint'`
+echo $VOL_CKAN_HOME
+echo $VOL_CKAN_CONFIG
+echo $VOL_CKAN_STORAGE
+```
+
 update local repo
 
 ```bash
@@ -668,6 +679,12 @@ sudo chown 900:900 -R $VOL_CKAN_HOME/venv/src/ $VOL_CKAN_STORAGE
 
 or on windows run the command directly in the ckan container
 
+restart the ckan container
+
+```bash
+cd ~/ckan/contrib/docker
+sudo docker-compose restart ckan
+```
 ---
 
 # Troubleshooting
@@ -709,7 +726,6 @@ copy updated extension code to the volumes
 ```bash
 cd ~/ckan/contrib/docker
 sudo cp -r src/ckanext-cioos_theme/ $VOL_CKAN_HOME/venv/src/
-sudo cp -r src/ckanext-googleanalyticsbasic $VOL_CKAN_HOME/venv/src/
 sudo cp -r src/ckanext-cioos_harvest/ $VOL_CKAN_HOME/venv/src/
 sudo cp -r src/ckanext-harvest/ $VOL_CKAN_HOME/venv/src/
 sudo cp -r src/ckanext-spatial/ $VOL_CKAN_HOME/venv/src/
@@ -719,6 +735,7 @@ sudo cp -r src/ckanext-dcat/ $VOL_CKAN_HOME/venv/src/
 sudo cp src/cioos-siooc-schema/cioos-siooc_schema.json $VOL_CKAN_HOME/venv/src/ckanext-scheming/ckanext/scheming/cioos_siooc_schema.json
 sudo cp src/cioos-siooc-schema/organization.json $VOL_CKAN_HOME/venv/src/ckanext-scheming/ckanext/scheming/organization.json
 sudo cp src/cioos-siooc-schema/ckan_license.json $VOL_CKAN_HOME/venv/src/ckanext-scheming/ckanext/scheming/ckan_license.json
+sudo cp src/cioos-siooc-schema/*.wkt $VOL_CKAN_HOME/venv/src
 ```
 
 Exporting volumes on windows does not work so another option for copying files to the volumes is to use the `docker cp` command. You must know the path of the named volume in the container you are connecting to and the container must be running for this to work
@@ -1089,7 +1106,7 @@ Delete and re clone the ckan repo.
 If you edit a harvester config and then reharvest the existing harvester will continue to use the in memory harvester config. To solve this you should reindex the harvesters and restart the harvester docker containers
 
 ```bash
-sudo docker exec -it ckan ckan --config=/etc/ckan/production.ini harvester reindex 
+sudo docker exec -it ckan ckan --config=/etc/ckan/production.ini harvester reindex
 sudo docker-compose restart ckan_run_harvester ckan_fetch_harvester ckan_gather_harvester
 ```
 

changes/6120.bugfix

@@ -0,0 +1 @@
+Consistent CLI behavior when when no command provided and when using `--help` options

changes/6477.bugfix

@@ -0,0 +1,3 @@
+Type of uploads for group and user image can be restricted via the
+`ckan.upload.{object_type}.types` and `ckan.upload.{object_type}.mimetypes`
+config options (eg :ref:`ckan.upload.group.types`, :ref:`ckan.upload.user.mimetypes`)

changes/6546.bugfix

@@ -0,0 +1 @@
+Fix regression when validating resource subfields

ckan/__init__.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-__version__ = '2.9.3'
+__version__ = '2.9.5'
 
 __description__ = 'CKAN Software'
 __long_description__ = \

ckan/cli/asset.py

@@ -12,10 +12,9 @@
 log = logging.getLogger(__name__)
 
 
-@click.group()
+@click.group(short_help=u"WebAssets commands.")
 def asset():
     """WebAssets commands.
-
     """
     pass