diff app/helpers/activities_helper.rb @ 1502:cadec15c77d5 cannam

Merge from branch "live"
author Chris Cannam
date Fri, 21 Mar 2014 13:03:45 +0000
parents 1c7af51e9409
children afce8026aaeb
line wrap: on
line diff
--- a/app/helpers/activities_helper.rb	Fri Mar 21 13:03:27 2014 +0000
+++ b/app/helpers/activities_helper.rb	Fri Mar 21 13:03:45 2014 +0000
@@ -138,7 +138,7 @@
       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