From d1acb58f2e4b094c04d5461d63ca24dabc23e4ff Mon Sep 17 00:00:00 2001 From: tobes Date: Mon, 19 Nov 2012 16:14:15 +0000 Subject: [PATCH] fix sa warning in tests/functional/api/test_activity.py:TestActivity.test_create_group --- ckan/logic/action/get.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index a6776216aff..146cd899b86 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -1794,8 +1794,11 @@ def group_activity_list(context, data_dict): # Get the group's activities. query = model.Session.query(model.Activity) - query = query.filter(_or_(model.Activity.object_id == group_id, - model.Activity.object_id.in_(dataset_ids))) + if dataset_ids: + query = query.filter(_or_(model.Activity.object_id == group_id, + model.Activity.object_id.in_(dataset_ids))) + else: + query = query.filter(model.Activity.object_id == group_id) query = query.order_by(_desc(model.Activity.timestamp)) query = query.limit(15) activity_objects = query.all()