From eb921d07a18fce3a62838ad5e35c8aff394b066a Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Wed, 6 Mar 2013 12:46:27 +0100 Subject: [PATCH] Revert "[#368] Add `num_followers` to group schema" This reverts commit c7bc31565811444ef225d3716a6b43d761801b9d. --- ckan/lib/navl/validators.py | 3 --- ckan/logic/action/get.py | 7 +++---- ckan/logic/schema.py | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ckan/lib/navl/validators.py b/ckan/lib/navl/validators.py index dcfd9f50331..f72e2788617 100644 --- a/ckan/lib/navl/validators.py +++ b/ckan/lib/navl/validators.py @@ -92,6 +92,3 @@ def convert_int(value, context): except ValueError: raise Invalid(_('Please enter an integer value')) -def read_only_validator(value, context): - - return value diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index 854f88419a9..3e4c9866feb 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -845,13 +845,12 @@ def _group_or_org_show(context, data_dict, is_org=False): except AttributeError: schema = group_plugin.db_to_form_schema() - group_dict['num_followers'] = logic.get_action('group_follower_count')( - {'model': model, 'session': model.Session}, - {'id': group_dict['id']}) - if schema: group_dict, errors = _validate(group_dict, schema, context=context) + group_dict['num_followers'] = logic.get_action('group_follower_count')( + {'model': model, 'session': model.Session}, + {'id': group_dict['id']}) return group_dict diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index 0d034bf1542..53af9fd01ef 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -5,8 +5,7 @@ ignore, if_empty_same_as, not_missing, - ignore_empty, - read_only_validator + ignore_empty ) from ckan.logic.validators import (package_id_not_changed, package_id_exists, @@ -307,7 +306,6 @@ def default_group_schema(): def group_form_schema(): schema = default_group_schema() #schema['extras_validation'] = [duplicate_extras_key, ignore] - schema['num_followers'] = [ignore_missing, int_validator, read_only_validator] schema['packages'] = { "name": [not_empty, unicode], "title": [ignore_missing],