meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-06 23:51:31 +00:00
Code Issues Releases Wiki Activity

Show the same trackers and statuses on time entry queries (#5385).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16577 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-05-27 09:19:14 +00:00
parent d6b0fca902
commit d9418864b6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue_query.rb
View File

@ -82,7 +82,7 @@ class IssueQuery < Query
def initialize_available_filters
add_available_filter "status_id",
:type => :list_status, :values => lambda { issue_statuses }
:type => :list_status, :values => lambda { issue_statuses_values }
add_available_filter("project_id",
:type => :list, :values => lambda { project_values }

2
app/models/query.rb
View File

@ -552,7 +552,7 @@ class Query < ActiveRecord::Base
end
# Returns a scope of issue statuses that are available as columns for filters
def issue_statuses
def issue_statuses_values
if project
statuses = project.rolled_up_statuses
else

4
app/models/time_entry_query.rb
View File

@ -56,11 +56,11 @@ class TimeEntryQuery < Query
add_available_filter("issue.tracker_id",
:type => :list,
:name => l("label_attribute_of_issue", :name => l(:field_tracker)),
:values => lambda { Tracker.sorted.map {|t| [t.name, t.id.to_s]} })
:values => lambda { trackers.map {|t| [t.name, t.id.to_s]} })
add_available_filter("issue.status_id",
:type => :list,
:name => l("label_attribute_of_issue", :name => l(:field_status)),
:values => lambda { IssueStatus.sorted.map {|s| [s.name, s.id.to_s]} })
:values => lambda { issue_statuses_values })
add_available_filter("issue.fixed_version_id",
:type => :list,
:name => l("label_attribute_of_issue", :name => l(:field_fixed_version)),