fix sa warning in tests/functional/api/test_activity.py:TestActivity.…

…test_create_group
ckan · Nov 19, 2012 · d1acb58 · d1acb58
1 parent 326a7c0
commit d1acb58
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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()