diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-09 19:18:57 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-09 19:18:57 +0000 |
| commit | 9dc07d4790aac44b5183c8a19759512dc777f259 (patch) | |
| tree | ce07b6538bccea104afebfff4f3784e19e34b65c /app/controllers/timelog_controller.rb | |
| parent | 093ecdfc730f2a35bcdb289603d8f714d5dce320 (diff) | |
| download | redmine-9dc07d4790aac44b5183c8a19759512dc777f259.tar.gz redmine-9dc07d4790aac44b5183c8a19759512dc777f259.zip | |
Adds filters for regular/custom fields to the time entries list/report (#10191).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10970 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
| -rw-r--r-- | app/controllers/timelog_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index a2dcfac7d..ab4897d2c 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -39,7 +39,7 @@ class TimelogController < ApplicationController helper :queries def index - @query = TimeEntryQuery.build_from_params(params, :name => '_') + @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_') scope = time_entry_scope sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria) @@ -90,7 +90,7 @@ class TimelogController < ApplicationController end def report - @query = TimeEntryQuery.build_from_params(params, :name => '_') + @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_') scope = time_entry_scope @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope) |