diff app/helpers/activities_helper.rb @ 1022:f2ec92061fca browsing

Merge from live branch

--- a/app/helpers/activities_helper.rb	Tue Nov 13 10:35:23 2012 +0000
+++ b/app/helpers/activities_helper.rb	Tue Nov 13 10:35:40 2012 +0000
@@ -13,8 +13,14 @@
   end
 
   def busy_institutions(events, count)
-    authors = events.map { |e| e.event_author unless !e.respond_to?(:event_author) }.compact
-    institutions = authors.map { |a| a.ssamr_user_detail.institution_name }
+    authors = events.map do |e|
+      e.event_author unless !e.respond_to?(:event_author) 
+    end.compact
+    institutions = authors.map do |a|
+      if a.respond_to?(:ssamr_user_detail) and !a.ssamr_user_detail.nil?
+        a.ssamr_user_detail.institution_name
+      end
+    end
     insthash = institutions.compact.sort.group_by { |i| i }
     insthash = insthash.merge(insthash) { |k,v| v.length }
     threshold = insthash.values.sort.last(count).first