comparison app/helpers/activities_helper.rb @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"

   def busy_institutions(events, count)
     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?
+      if a.respond_to?(:ssamr_user_detail) and !a.ssamr_user_detail.nil? and a.ssamr_user_detail.institution_name != "none"
         a.ssamr_user_detail.institution_name
       end
     end
     insthash = institutions.compact.sort.group_by { |i| i }
     insthash = insthash.merge(insthash) { |k,v| v.length }