From e91b70ac187c6a1eb74b53779785e9d41245fc40 Mon Sep 17 00:00:00 2001 From: amercader Date: Mon, 12 Jan 2015 15:04:09 +0000 Subject: [PATCH] [#1852] Fix merge error that was causing failures --- ckan/logic/action/create.py | 3 ++- ckan/logic/action/update.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index 4dc77f1290d..db91bf46c3e 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -208,7 +208,7 @@ def package_create(context, data_dict): # Create default views for resources if necessary if data.get('resources'): - datapreview.add_default_views_to_dataset_resources(context, data) + ckan.lib.datapreview.add_default_views_to_dataset_resources(context, data) if not context.get('defer_commit'): model.repo.commit() @@ -343,6 +343,7 @@ def resource_view_create(context, data_dict): resource_id = _get_or_bust(data_dict, 'resource_id') view_type = _get_or_bust(data_dict, 'view_type') view_plugin = ckan.lib.datapreview.get_view_plugin(view_type) + if not view_plugin: raise ValidationError( {"view_type": "No plugin found for view_type {view_type}".format( diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 87bef8eb97a..a8e5d7359ed 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -362,7 +362,7 @@ def package_update(context, data_dict): # Create default views for resources if necessary if data.get('resources'): - datapreview.add_default_views_to_dataset_resources(context, data) + ckan.lib.datapreview.add_default_views_to_dataset_resources(context, data) if not context.get('defer_commit'): model.repo.commit()