Merge branch 'master' into 2375-demo-theme-development

ckan · Aug 10, 2012 · d88ca4d · d88ca4d
2 parents a40a369 + abf6adb
commit d88ca4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py
@@ -35,7 +35,7 @@ def get_snippet_resource(activity, detail):
                            activity['data']['package']['id'])
 
 def get_snippet_related_item(activity, detail):
-    return h.relate_item_link(activity['data']['related'])
+    return h.related_item_link(activity['data']['related'])
 
 def get_snippet_related_type(activity, detail):
     # FIXME this needs to be translated

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -913,7 +913,7 @@ def resource_link(resource_dict, package_id):
     return link_to(text, url)
 
 def related_item_link(related_item_dict):
-    text = related_item_dict.title
+    text = related_item_dict.get('title', '')
     url = url_for(controller='related',
         action='read',
         id=related_item_dict['id'])