[#1519] Fix organization activity filter in dashboard

The old implementation had the same type for orgs and groups and when an org was selected a 404 was returned because group_show was called. I didn't go all the way down separating both, ie group_followee list still returns both groups and orgs. Conflicts: ckan/logic/action/get.py
ckan · Jun 19, 2014 · ed70771 · ed70771
1 parent 549cf83
commit ed70771
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py
@@ -570,7 +570,8 @@ def display_name(followee):
             action_functions = {
                 'dataset': 'package_show',
                 'user': 'user_show',
-                'group': 'group_show'
+                'group': 'group_show',
+                'organization': 'organization_show',
             }
             action_function = logic.get_action(
                 action_functions.get(filter_type))

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -1413,7 +1413,8 @@ def dashboard_activity_stream(user_id, filter_type=None, filter_id=None,
         action_functions = {
             'dataset': 'package_activity_list_html',
             'user': 'user_activity_list_html',
-            'group': 'group_activity_list_html'
+            'group': 'group_activity_list_html',
+            'organization': 'organization_activity_list_html',
         }
         action_function = logic.get_action(action_functions.get(filter_type))
         return action_function(context, {'id': filter_id, 'offset': offset})

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
@@ -2695,9 +2695,12 @@ def display_name(followee):
         dicts = followee_list_function(context, data_dict)
         for d in dicts:
             followee_dicts.append(
-                    {'type': followee_type,
-                    'display_name': display_name(d),
-                    'dict': d})
+                # TODO: groups and orgs should probably have their own
+                #       followee_list function
+                {'type': followee_type if followee_type != 'group'
+                 else d.get('type'),
+                 'display_name': display_name(d),
+                 'dict': d})
 
     followee_dicts.sort(key=lambda d: d['display_name'])
 

diff --git a/ckan/templates/user/snippets/followee_dropdown.html b/ckan/templates/user/snippets/followee_dropdown.html
@@ -5,6 +5,8 @@
     <i class="icon-user"></i>
   {% elif type == 'group' %}
     <i class="icon-group"></i>
+  {% elif type == 'organization' %}
+    <i class="icon-building"></i>
   {% endif %}
 {%- endmacro %}