diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-15 09:49:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-15 09:49:12 +0000 |
| commit | c6fc1a8047cb2707882cbc586065bf3bd7872aa2 (patch) | |
| tree | 97c3b957e08bd9885d4f7526dbe7a72875740425 /app/controllers/timelog_controller.rb | |
| parent | a4a91cab7ef70d900f35c7d0b6b41de5e1ba8ea4 (diff) | |
| download | redmine-c6fc1a8047cb2707882cbc586065bf3bd7872aa2.tar.gz redmine-c6fc1a8047cb2707882cbc586065bf3bd7872aa2.zip | |
Fixed that filtering time entries on activity does not take care of activity overrides (#15623).
git-svn-id: http://svn.redmine.org/redmine/trunk@12414 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
| -rw-r--r-- | app/controllers/timelog_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 1a880a133..a8f4d53a6 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -47,7 +47,7 @@ class TimelogController < ApplicationController sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria) sort_update(@query.sortable_columns) scope = time_entry_scope(:order => sort_clause). - includes(:project, :activity, :user, :issue). + includes(:project, :user, :issue). preload(:issue => [:project, :tracker, :status, :assigned_to, :priority]) respond_to do |format| |