Mercurial > hg > soundsoftware-site
comparison app/controllers/activities_controller.rb @ 1014:e3f78fa30a36 live
Again avoid bombing out when faced with odd events
author | Chris Cannam |
---|---|
date | Mon, 12 Nov 2012 15:17:47 +0000 |
parents | 066b55d7c053 |
children | bb32da3bea34 |
comparison
equal
deleted
inserted
replaced
1013:b98f60a6d231 | 1014:e3f78fa30a36 |
---|---|
42 | 42 |
43 @institution_name = params[:institution] | 43 @institution_name = params[:institution] |
44 if !@institution_name.blank? | 44 if !@institution_name.blank? |
45 events = events.select do |e| | 45 events = events.select do |e| |
46 e.respond_to?(:event_author) and e.event_author and | 46 e.respond_to?(:event_author) and e.event_author and |
47 e.event_author.respond_to?(:ssamr_user_detail) and | |
48 !e.event_author.ssamr_user_detail.nil? and | |
47 e.event_author.ssamr_user_detail.institution_name == @institution_name | 49 e.event_author.ssamr_user_detail.institution_name == @institution_name |
48 end | 50 end |
49 if events.empty? | 51 if events.empty? |
50 # We don't want to dump into the output any arbitrary string | 52 # We don't want to dump into the output any arbitrary string |
51 # from the URL that has no matching events | 53 # from the URL that has no matching events |