Skip to content

Commit

Permalink
[#1625] Fix user activity streams
Browse files Browse the repository at this point in the history
Users aren't revisioned, so don't try to save the revision ID in the
activity table for new or changed user activities.
  • Loading branch information
Sean Hammond committed Jan 20, 2012
1 parent 0d145f8 commit 1d40201
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion ckan/logic/action/create.py
Expand Up @@ -319,7 +319,10 @@ def activity_create(context, activity_dict):
model = context['model']

assert not activity_dict.has_key('revision_id')
activity_dict['revision_id'] = model.Session.revision.id
if getattr(model.Session, "revision", None):
activity_dict['revision_id'] = model.Session.revision.id
else:
activity_dict['revision_id'] = None

activity = activity_dict_save(activity_dict, context)

Expand Down
1 change: 1 addition & 0 deletions ckan/logic/action/update.py
Expand Up @@ -395,6 +395,7 @@ def user_update(context, data_dict):
'object_id': user.id,
'activity_type': 'changed user',
}

from ckan.logic.action.create import activity_create
activity_create(context, activity_dict)
# TODO: Also create an activity detail recording what exactly changed in
Expand Down
1 change: 0 additions & 1 deletion ckan/templates/activity_streams/changed_user.html
Expand Up @@ -14,4 +14,3 @@
</div>
</div>
</html>

0 comments on commit 1d40201

Please sign in to comment.