[#1178] Move user_invite_schema to ckan.logic.schema

ckan · Oct 11, 2013 · 1da817c · 1da817c
1 parent d073ce7
commit 1da817c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
@@ -860,12 +860,8 @@ def user_invite(context, data_dict):
     '''
     _check_access('user_invite', context, data_dict)
 
-    user_invite_schema = {
-        'email': [validators.not_empty, unicode],
-        'group_id': [validators.not_empty],
-        'role': [validators.not_empty],
-    }
-    data, errors = _validate(data_dict, user_invite_schema, context)
+    schema = context.get('schema') or ckan.logic.schema.default_user_invite_schema()
+    data, errors = _validate(data_dict, schema, context)
     if errors:
         raise ValidationError(errors)
 

diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -424,6 +424,14 @@ def default_update_user_schema():
 
     return schema
 
+def default_user_invite_schema():
+    schema = {
+        'email': [not_empty, unicode],
+        'group_id': [not_empty],
+        'role': [not_empty],
+    }
+    return schema
+
 def default_task_status_schema():
     schema = {
         'id': [ignore],