Merge branch 'master' of github.com:okfn/ckan into 1635-feature-email…

…-notifications-for-activity-streams
ckan · Nov 28, 2012 · 0cdb0d3 · 0cdb0d3
2 parents 197fdf4 + 81a471c
commit 0cdb0d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ckan/model/activity.py b/ckan/model/activity.py
@@ -150,6 +150,10 @@ def _group_activity_query(group_id, limit=15):
     import ckan.model as model
 
     group = model.Group.get(group_id)
+    if not group:
+        # Return a query with no results.
+        return model.Session.query(model.Activity).filter("0=1")
+
     dataset_ids = [dataset.id for dataset in group.packages()]
 
     q = model.Session.query(model.Activity)

diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt
@@ -1,6 +1,5 @@
 # These are packages that required when running ckan tests
 
 nose
-requests==0.6.4
 -e git+https://github.com/okfn/ckanclient#egg=ckanclient
 
diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -27,3 +27,4 @@ routes==1.13
 paste==1.7.5.1
 Jinja2==2.6
 fanstatic==0.12
+requests==0.14