[#1795] remove thing_type from plugin_validate and validate plugin me…

…thods

ckan/lib/plugins.py

@@ -170,14 +170,13 @@ def register_group_plugins(map):
         _default_group_plugin = DefaultGroupForm()
 
 
-def plugin_validate(plugin, context, data_dict, schema, action, thing_type):
+def plugin_validate(plugin, context, data_dict, schema, action):
     """
     Backwards compatibility with 2.x dataset group and org plugins:
     return a default validate method if one has not been provided.
     """
     if hasattr(plugin, 'validate'):
-        result = plugin.validate(
-            context, data_dict, schema, action, thing_type)
+        result = plugin.validate(context, data_dict, schema, action)
         if result is not None:
             return result
 

ckan/lib/search/index.py

@@ -113,7 +113,7 @@ def index_package(self, pkg_dict, defer_commit=False):
             schema = package_plugin.show_package_schema()
             validated_pkg_dict, errors = lib_plugins.plugin_validate(
                 package_plugin, {'model': model, 'session': model.Session},
-                pkg_dict, schema, 'package_show', pkg_dict.get('type'))
+                pkg_dict, schema, 'package_show')
             pkg_dict['validated_data_dict'] = json.dumps(validated_pkg_dict,
                 cls=ckan.lib.navl.dictization_functions.MissingNullEncoder)
 

ckan/logic/action/create.py

@@ -151,8 +151,7 @@ def package_create(context, data_dict):
                 package_plugin.check_data_dict(data_dict)
 
     data, errors = lib_plugins.plugin_validate(
-        package_plugin, context, data_dict, schema,
-        'package_create', package_type)
+        package_plugin, context, data_dict, schema, 'package_create')
     log.debug('package_create validate_errs=%r user=%s package=%s data=%r',
               errors, context.get('user'),
               data.get('name'), data_dict)
@@ -596,7 +595,7 @@ def _group_or_org_create(context, data_dict, is_org=False):
 
     data, errors = lib_plugins.plugin_validate(
         group_plugin, context, data_dict, schema,
-        'organization_create' if is_org else 'group_create', group_type)
+        'organization_create' if is_org else 'group_create')
     log.debug('group_create validate_errs=%r user=%s group=%s data_dict=%r',
               errors, context.get('user'), data_dict.get('name'), data_dict)
 

ckan/logic/action/get.py

@@ -957,7 +957,7 @@ def package_show(context, data_dict):
             if schema and context.get('validate', True):
                 package_dict, errors = lib_plugins.plugin_validate(
                     package_plugin, context, package_dict, schema,
-                    'package_show', package_dict['type'])
+                    'package_show')
 
     for item in plugins.PluginImplementations(plugins.IPackageController):
         item.after_show(context, package_dict)
@@ -1159,7 +1159,7 @@ def _group_or_org_show(context, data_dict, is_org=False):
         schema = logic.schema.default_show_group_schema()
     group_dict, errors = lib_plugins.plugin_validate(
         group_plugin, context, group_dict, schema,
-        'organization_show' if is_org else 'group_show', group_dict['type'])
+        'organization_show' if is_org else 'group_show')
     return group_dict
 
 

ckan/logic/action/update.py

@@ -392,8 +392,7 @@ def package_update(context, data_dict):
                 package_plugin.check_data_dict(data_dict)
 
     data, errors = lib_plugins.plugin_validate(
-        package_plugin, context, data_dict, schema,
-        'package_update', pkg.type)
+        package_plugin, context, data_dict, schema, 'package_update')
     log.debug('package_update validate_errs=%r user=%s package=%s data=%r',
               errors, context.get('user'),
               context.get('package').name if context.get('package') else '',
@@ -597,7 +596,7 @@ def _group_or_org_update(context, data_dict, is_org=False):
 
     data, errors = lib_plugins.plugin_validate(
         group_plugin, context, data_dict, schema,
-        'organization_update' if is_org else 'group_update', group.type)
+        'organization_update' if is_org else 'group_update')
     log.debug('group_update validate_errs=%r user=%s group=%s data_dict=%r',
               errors, context.get('user'),
               context.get('group').name if context.get('group') else '',

ckan/plugins/interfaces.py

@@ -957,7 +957,7 @@ def resource_form(self):
         :rtype: string
         '''
 
-    def validate(self, context, data_dict, schema, action, dataset_type):
+    def validate(self, context, data_dict, schema, action):
         """Customize validation of datasets.
 
         When this method is implemented it is used to perform all validation
@@ -982,8 +982,6 @@ def validate(self, context, data_dict, schema, action, dataset_type):
         :param action: ``'package_show'``, ``'package_create'`` or
           ``'package_update'``
         :type action: string
-        :param dataset_type: the type of the dataset
-        :type dataset_type: string
         :returns: (data_dict, errors) where data_dict is the possibly-modified
           dataset and errors is a dictionary with keys matching data_dict
           and lists-of-string-error-messages as values
@@ -1110,7 +1108,7 @@ def setup_template_variables(self, context, data_dict):
         Add variables to c just prior to the template being rendered.
         """
 
-    def validate(self, context, data_dict, schema, action, group_type):
+    def validate(self, context, data_dict, schema, action):
         """Customize validation of groups.
 
         When this method is implemented it is used to perform all validation
@@ -1136,8 +1134,6 @@ def validate(self, context, data_dict, schema, action, group_type):
           ``'group_update'``, ``'organization_show'``,
           ``'organization_create'`` or ``'organization_update'``
         :type action: string
-        :param group_type: the type of the group
-        :type group_type: string
         :returns: (data_dict, errors) where data_dict is the possibly-modified
           group and errors is a dictionary with keys matching data_dict
           and lists-of-string-error-messages as values