From e1818f5cf1baa52ede9ba24922f11267c70ce74a Mon Sep 17 00:00:00 2001 From: tobes Date: Thu, 27 Sep 2012 10:41:53 +0100 Subject: [PATCH] [#2939] Helper Organizations activities created --- ckan/logic/action/create.py | 7 ++++++- ckan/logic/action/update.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index 89a8cff7ab1..0c46736e227 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -506,10 +506,15 @@ def _group_or_org_create(context, data_dict, is_org=False): for item in plugins.PluginImplementations(plugins.IGroupController): item.create(group) + if is_org: + activity_type = 'new organization' + else: + activity_type = 'new group' + activity_dict = { 'user_id': model.User.by_name(user.decode('utf8')).id, 'object_id': group.id, - 'activity_type': 'new group', + 'activity_type': activity_type, } activity_dict['data'] = { 'group': ckan.lib.dictization.table_dictize(group, context) diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 8942dfda525..a2a793894df 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -459,10 +459,15 @@ def _group_or_org_update(context, data_dict, is_org=False): for item in plugins.PluginImplementations(plugins.IGroupController): item.edit(group) + if is_org: + activity_type = 'changed organization' + else: + activity_type = 'changed group' + activity_dict = { 'user_id': model.User.by_name(user.decode('utf8')).id, 'object_id': group.id, - 'activity_type': 'changed group', + 'activity_type': activity_type, } # Handle 'deleted' groups. # When the user marks a group as deleted this comes through here as