Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

use "do end" instead of {} at app/models/issue_query.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20286 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-11-07 12:30:54 +00:00
parent f19f4a948f
commit d84e0366a1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/issue_query.rb
View File

@@ -40,10 +40,10 @@ class IssueQuery < Query
QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours", :totalable => true), QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours", :totalable => true),
QueryColumn.new( QueryColumn.new(
:total_estimated_hours, :total_estimated_hours,
:sortable => -> { :sortable => -> do
"COALESCE((SELECT SUM(estimated_hours) FROM #{Issue.table_name} subtasks" + "COALESCE((SELECT SUM(estimated_hours) FROM #{Issue.table_name} subtasks" +
" WHERE #{Issue.visible_condition(User.current).gsub(/\bissues\b/, 'subtasks')} AND subtasks.root_id = #{Issue.table_name}.root_id AND subtasks.lft >= #{Issue.table_name}.lft AND subtasks.rgt <= #{Issue.table_name}.rgt), 0)" " WHERE #{Issue.visible_condition(User.current).gsub(/\bissues\b/, 'subtasks')} AND subtasks.root_id = #{Issue.table_name}.root_id AND subtasks.lft >= #{Issue.table_name}.lft AND subtasks.rgt <= #{Issue.table_name}.rgt), 0)"
}, end,
:default_order => 'desc'), :default_order => 'desc'),
QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true), QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
TimestampQueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc', :groupable => true), TimestampQueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc', :groupable => true),
@@ -265,9 +265,9 @@ class IssueQuery < Query
disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')} disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
disabled_fields << "total_estimated_hours" if disabled_fields.include?("estimated_hours") disabled_fields << "total_estimated_hours" if disabled_fields.include?("estimated_hours")
@available_columns.reject! {|column| @available_columns.reject! do |column|
disabled_fields.include?(column.name.to_s) disabled_fields.include?(column.name.to_s)
} end
@available_columns @available_columns
end end