[#1852] Fix merge error that was causing failures

ckan · Jan 12, 2015 · e91b70a · e91b70a
1 parent 2da53f7
commit e91b70a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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()