[#1633] Add activity streams to group pages

Still needs a unit test and to look nicer

ckan/controllers/group.py

@@ -16,6 +16,7 @@
 from ckan.logic import tuplize_dict, clean_dict, parse_params
 from ckan.lib.dictization.model_dictize import package_dictize
 import ckan.forms
+import ckan.logic.action.get
 
 class GroupController(BaseController):
 
@@ -110,6 +111,12 @@ def read(self, id):
         for pkg_rev in c.page.items:
             result.append(package_dictize(pkg_rev, context))
         c.page.items = result
+
+        # Add the group's activity stream (already rendered to HTML) to the
+        # template context for the group/read.html template to retrieve later.
+        c.group_activity_stream = \
+                ckan.logic.action.get.group_activity_list_html(context,
+                    {'id': c.group_dict['id']})
 
         return render('group/read.html')
 

ckan/logic/action/get.py

@@ -872,6 +872,14 @@ def package_activity_list(context, data_dict):
             model.activity.Activity).filter_by(object_id=package_id).all()
     return activity_list_dictize(activity_objects, context)
 
+def group_activity_list(context, data_dict):
+    '''Return a group's public activity stream as a list of dicts.'''
+    model = context['model']
+    group_id = data_dict['id']
+    activity_objects = model.Session.query(
+            model.activity.Activity).filter_by(object_id=group_id).all()
+    return activity_list_dictize(activity_objects, context)
+
 def activity_detail_list(context, data_dict):
     '''Return an activity's list of activity detail items, as a list of dicts.
     
@@ -971,3 +979,13 @@ def package_activity_list_html(context, data_dict):
     '''
     activity_stream = package_activity_list(context, data_dict)
     return _activity_list_to_html(context, activity_stream)
+
+def group_activity_list_html(context, data_dict):
+    '''Return an HTML rendering of a group's public activity stream.
+
+    The activity stream is rendered as a snippet of HTML meant to be included
+    in an HTML page.
+
+    '''
+    activity_stream = group_activity_list(context, data_dict)
+    return _activity_list_to_html(context, activity_stream)

ckan/templates/group/read.html

@@ -18,6 +18,10 @@ <h3>Administrators</h3>
           </ul>
         </li>
         </py:if>
+        <li>
+        <h3>Activity</h3>
+            ${c.group_activity_stream}
+        </li>
       </ul>
     </li>
   </py:match>