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

Change 'redirect' calls to 'h.redirect_to' 

ckan.lib.base.redirect was removed in [1], guidance is to always use h.redirect_to instead.  Manifested as 503 errors in the harvest UI against an install of CKAN master branch. 

[1] 34f3f18e88
This commit is contained in:
Andy Gross 2016-09-18 03:23:29 -07:00 committed by GitHub
parent 57173ff9fe
commit f2e1dc512c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ckanext/harvest/controllers/view.py
View File

@ -15,7 +15,7 @@ from ckan import model
import ckan.plugins as p import ckan.plugins as p
import ckan.lib.helpers as h, json import ckan.lib.helpers as h, json
from ckan.lib.base import BaseController, c, \ from ckan.lib.base import BaseController, c, \
request, response, render, abort, redirect request, response, render, abort
from ckanext.harvest.logic import HarvestJobExists, HarvestSourceInactiveError from ckanext.harvest.logic import HarvestJobExists, HarvestSourceInactiveError
from ckanext.harvest.plugin import DATASET_TYPE_NAME from ckanext.harvest.plugin import DATASET_TYPE_NAME
@ -46,7 +46,7 @@ class ViewController(BaseController):
else: else:
h.flash_success(_('Harvesting source successfully inactivated')) h.flash_success(_('Harvesting source successfully inactivated'))
redirect(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id)) h.redirect_to(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id))
except p.toolkit.ObjectNotFound: except p.toolkit.ObjectNotFound:
abort(404,_('Harvest source not found')) abort(404,_('Harvest source not found'))
except p.toolkit.NotAuthorized: except p.toolkit.NotAuthorized:
@ -74,7 +74,7 @@ class ViewController(BaseController):
msg = 'An error occurred: [%s]' % str(e) msg = 'An error occurred: [%s]' % str(e)
h.flash_error(msg) h.flash_error(msg)
redirect(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id)) h.redirect_to(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id))
def clear(self, id): def clear(self, id):
try: try:
@ -89,7 +89,7 @@ class ViewController(BaseController):
msg = 'An error occurred: [%s]' % str(e) msg = 'An error occurred: [%s]' % str(e)
h.flash_error(msg) h.flash_error(msg)
redirect(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id)) h.redirect_to(h.url_for('{0}_admin'.format(DATASET_TYPE_NAME), id=id))
def show_object(self, id, ref_type='object'): def show_object(self, id, ref_type='object'):