CatalogueRevamping
/
spatial-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 63-extend-spatial-harvesters 

Conflicts:
	ckanext/spatial/harvesters/base.py
This commit is contained in:
amercader 2014-05-13 15:33:04 +01:00
parent 57b7e51e5a ab241d2530
commit b25a01029a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ckanext/spatial/harvesters/base.py
View File

@ -673,7 +673,12 @@ class SpatialHarvester(HarvesterBase):
''' '''
if self._user_name: if self._user_name:
return 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') config_user_name = config.get('ckanext.spatial.harvest.user_name')
if config_user_name: if config_user_name: