Mercurial > hg > soundsoftware-site
diff app/helpers/activities_helper.rb @ 1519:afce8026aaeb redmine-2.4-integration
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:34:53 +0100 |
parents | c86dacc2ef0a 1c7af51e9409 |
children |
line wrap: on
line diff
--- a/app/helpers/activities_helper.rb Tue Sep 09 09:32:11 2014 +0100 +++ b/app/helpers/activities_helper.rb Tue Sep 09 09:34:53 2014 +0100 @@ -168,7 +168,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