diff --git a/ckan/tests/logic/test_action.py b/ckan/tests/logic/test_action.py index 941ba379fa6..87e23ad390c 100644 --- a/ckan/tests/logic/test_action.py +++ b/ckan/tests/logic/test_action.py @@ -1378,10 +1378,10 @@ def test_resource_view_create_bad_type(self): 'title': u'View', 'description': u'A nice view'} postparams = '%s=1' % json.dumps(resource_view) - res = self.app.post( + self.app.post( '/api/action/resource_view_create', params=postparams, extra_environ={'Authorization': str(self.normal_user.apikey)}, - status = 409) + status=409) def test_resource_view_create_missing_required_fields(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id @@ -1412,6 +1412,7 @@ def test_resource_view_create_invalid_resource_id(self): def test_resource_view_create_not_authorized_if_not_logged_in(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id resource_view = {'resource_id': resource_id, + 'title': u'Resource View', 'view_type': u'image', 'image_url': 'url'} postparams = '%s=1' % json.dumps(resource_view) @@ -1457,7 +1458,6 @@ def test_resource_view_list_reorder(self): extra_environ=extra_environ) resource_id_1 = json.loads(res.body)['result']['id'] - #### Make second view #### resource_view['title'] = 'View2' postparams = '%s=1' % json.dumps(resource_view) @@ -1476,8 +1476,9 @@ def test_resource_view_list_reorder(self): assert result[1]['title'] == 'View2', result[1]['title'] ### Reorder Views - postparams = '%s=1' % json.dumps({'id': resource_id, - 'order': [resource_id_2, resource_id_1]}) + postparams = '%s=1' % json.dumps({ + 'id': resource_id, + 'order': [resource_id_2, resource_id_1]}) res = self.app.post('/api/action/resource_view_reorder', params=postparams, extra_environ=extra_environ) result = json.loads(res.body)['result'] @@ -1509,7 +1510,6 @@ def test_resource_view_list_reorder(self): assert result[0]['title'] == 'View', result[0]['title'] assert result[1]['title'] == 'View2', result[1]['title'] - def test_resource_view_show_missing_resource_view_id(self): postparams = '%s=1' % json.dumps({}) self.app.post('/api/action/resource_view_show', @@ -1553,6 +1553,7 @@ def test_resource_view_update_missing_resource_view_id(self): def test_resource_view_update_invalid_resource_view_id(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id resource_view = {'resource_id': resource_id, + 'title': u'Resource View', 'view_type': u'image', 'image_url': 'url'} postparams = '%s=1' % json.dumps(resource_view) @@ -1570,6 +1571,7 @@ def test_resource_view_update_invalid_resource_view_id(self): def test_resource_view_update_invalid_auth(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id resource_view = {'resource_id': resource_id, + 'title': u'Resource View', 'view_type': u'image', 'image_url': 'url'} postparams = '%s=1' % json.dumps(resource_view) @@ -1587,6 +1589,7 @@ def test_resource_view_update_invalid_auth(self): def test_resource_view_delete(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id resource_view = {'resource_id': resource_id, + 'title': u'Resource View', 'view_type': u'image', 'image_url': 'url'} postparams = '%s=1' % json.dumps(resource_view) @@ -1608,6 +1611,7 @@ def test_resource_view_delete(self): def test_resource_view_delete_invalid_auth(self): resource_id = model.Package.by_name(u'annakarenina').resources[0].id resource_view = {'resource_id': resource_id, + 'title': u'Resource View', 'view_type': u'image', 'image_url': 'url'} postparams = '%s=1' % json.dumps(resource_view) diff --git a/ckanext/imageview/plugin.py b/ckanext/imageview/plugin.py index 91a0c8729c9..d62efb2578b 100644 --- a/ckanext/imageview/plugin.py +++ b/ckanext/imageview/plugin.py @@ -1,9 +1,8 @@ import logging - import ckan.plugins as p -from ckan.lib.navl.validators import ignore_empty log = logging.getLogger(__name__) +ignore_empty = p.toolkit.get_validator('ignore_empty') DEFAULT_IMAGE_FORMATS = ['png', 'jpeg', 'jpg', 'gif']