Merge branch 'master' into 63-extend-spatial-harvesters
Conflicts: ckanext/spatial/harvesters/base.py
This commit is contained in:
commit
b25a01029a
|
@ -673,7 +673,12 @@ class SpatialHarvester(HarvesterBase):
|
|||
'''
|
||||
if self._user_name:
|
||||
return self._user_name
|
||||
self._site_user = p.toolkit.get_action('get_site_user')({'model': model, 'ignore_auth': True}, {})
|
||||
|
||||
context = {'model': model,
|
||||
'ignore_auth': True,
|
||||
'defer_commit': True, # See ckan/ckan#1714
|
||||
}
|
||||
self._site_user = p.toolkit.get_action('get_site_user')(context, {})
|
||||
|
||||
config_user_name = config.get('ckanext.spatial.harvest.user_name')
|
||||
if config_user_name:
|
||||
|
|
Loading…
Reference in New Issue