Merge branch '2845-bug-editing-organization-removes-datasets' into re…

…lease-v1.8

ckan/controllers/group.py

@@ -340,6 +340,7 @@ def _save_edit(self, id, context):
                 tuplize_dict(parse_params(request.params))))
             context['message'] = data_dict.get('log_message', '')
             data_dict['id'] = id
+            context['allow_partial_update'] = True
             group = get_action('group_update')(context, data_dict)
 
             if id != group['name']:

ckan/lib/dictization/model_save.py

@@ -319,7 +319,14 @@ def group_member_save(context, group_dict, member_table_name):
     model = context["model"]
     session = context["session"]
     group = context['group']
-    entity_list = group_dict.get(member_table_name, [])
+    entity_list = group_dict.get(member_table_name, None)
+
+    if entity_list is None:
+        if context.get('allow_partial_update', False):
+            return {'added': [], 'removed': []}
+        else:
+            entity_list = []
+
     entities = {}
     Member = model.Member
 
@@ -387,8 +394,8 @@ def group_dict_save(group_dict, context):
     group_groups_changed = group_member_save(context, group_dict, 'groups')
     group_tags_changed = group_member_save(context, group_dict, 'tags')
     log.debug('Group save membership changes - Packages: %r  Users: %r  '
-              'Groups: %r  Tags: %r', pkgs_edited, group_users_changed,
-              group_groups_changed, group_tags_changed)
+            'Groups: %r  Tags: %r', pkgs_edited, group_users_changed,
+            group_groups_changed, group_tags_changed)
 
     # We will get a list of packages that we have either added or
     # removed from the group, and trigger a re-index.