Mercurial > hg > soundsoftware-site

comparison app/controllers/activities_controller.rb @ 1022:f2ec92061fca browsing

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from live branch
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 13 Nov 2012 10:35:40 +0000
parents e3f78fa30a36
children bb32da3bea34
comparison
equal deleted inserted replaced
1021:967fb7e62b1d 1022:f2ec92061fca
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