From bde77eebe301f1463e7791025b583fb7a031447a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 3 Dec 2016 08:38:40 +0000 Subject: Merged r15952 and r15953 (#23922). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16043 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/timelog_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/controllers/timelog_controller.rb') diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 7e4d6b71d..acb106d3b 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -170,7 +170,7 @@ class TimelogController < ApplicationController end def bulk_edit - @available_activities = TimeEntryActivity.shared.active + @available_activities = @projects.map(&:activities).reduce(:&) @custom_fields = TimeEntry.first.available_custom_fields end @@ -236,7 +236,10 @@ private end def find_time_entries - @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).to_a + @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]). + preload(:project => :time_entry_activities). + preload(:user).to_a + raise ActiveRecord::RecordNotFound if @time_entries.empty? raise Unauthorized unless @time_entries.all? {|t| t.editable_by?(User.current)} @projects = @time_entries.collect(&:project).compact.uniq -- cgit v1.2.3