Mercurial > hg > soundsoftware-site
comparison app/controllers/timelog_controller.rb @ 1517:dffacf8a6908 redmine-2.5
Update to Redmine SVN revision 13367 on 2.5-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:29:00 +0100 |
parents | e248c7af89ec |
children |
comparison
equal
deleted
inserted
replaced
1516:b450a9d58aed | 1517:dffacf8a6908 |
---|---|
230 rescue ActiveRecord::RecordNotFound | 230 rescue ActiveRecord::RecordNotFound |
231 render_404 | 231 render_404 |
232 end | 232 end |
233 | 233 |
234 def find_time_entries | 234 def find_time_entries |
235 @time_entries = TimeEntry.find_all_by_id(params[:id] || params[:ids]) | 235 @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).all |
236 raise ActiveRecord::RecordNotFound if @time_entries.empty? | 236 raise ActiveRecord::RecordNotFound if @time_entries.empty? |
237 @projects = @time_entries.collect(&:project).compact.uniq | 237 @projects = @time_entries.collect(&:project).compact.uniq |
238 @project = @projects.first if @projects.size == 1 | 238 @project = @projects.first if @projects.size == 1 |
239 rescue ActiveRecord::RecordNotFound | 239 rescue ActiveRecord::RecordNotFound |
240 render_404 | 240 render_404 |