[#3108] Allow to renferece groups and users by id or name

Conflicts: ckan/logic/schema.py
ckan · Aug 25, 2016 · 0fd0f80 · 0fd0f80
1 parent b928013
commit 0fd0f80
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -45,6 +45,7 @@
                                    resource_id_exists,
                                    tag_not_in_vocabulary,
                                    group_id_exists,
+                                   group_id_or_name_exists,
                                    owner_org_validator,
                                    user_name_exists,
                                    role_exists,
@@ -544,8 +545,8 @@ def default_follow_dataset_schema():
 
 def member_schema():
     schema = {
-        'id': [not_missing, not_empty, group_id_exists, unicode],
-        'username': [not_missing, user_name_exists, unicode],
+        'id': [not_missing, not_empty, group_id_or_name_exists, unicode],
+        'username': [not_missing, user_id_or_name_exists, unicode],
         'role': [not_missing, role_exists, unicode],
     }
     return schema