meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity

shorten long line of app/models/issue_query.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20669 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-12-19 17:31:57 +00:00
parent 0370be3ed1
commit 69646935a1
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/models/issue_query.rb
View File

@ -107,9 +107,17 @@ class IssueQuery < Query
def build_from_params(params, defaults={}) def build_from_params(params, defaults={})
super super
self.draw_relations = params[:draw_relations] || (params[:query] && params[:query][:draw_relations]) || options[:draw_relations] self.draw_relations =
self.draw_progress_line = params[:draw_progress_line] || (params[:query] && params[:query][:draw_progress_line]) || options[:draw_progress_line] params[:draw_relations] ||
self.draw_selected_columns = params[:draw_selected_columns] || (params[:query] && params[:query][:draw_selected_columns]) || options[:draw_progress_line] (params[:query] && params[:query][:draw_relations]) || options[:draw_relations]
self.draw_progress_line =
params[:draw_progress_line] ||
(params[:query] && params[:query][:draw_progress_line]) ||
options[:draw_progress_line]
self.draw_selected_columns =
params[:draw_selected_columns] ||
(params[:query] && params[:query][:draw_selected_columns]) ||
options[:draw_progress_line]
self self
end end
@ -226,7 +234,10 @@ class IssueQuery < Query
add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
IssueRelation::TYPES.each do |relation_type, options| IssueRelation::TYPES.each do |relation_type, options|
add_available_filter relation_type, :type => :relation, :label => options[:name], :values => lambda {all_projects_values} add_available_filter(
relation_type, :type => :relation, :label => options[:name],
:values => lambda {all_projects_values}
)
end end
add_available_filter "parent_id", :type => :tree, :label => :field_parent_issue add_available_filter "parent_id", :type => :tree, :label => :field_parent_issue
add_available_filter "child_id", :type => :tree, :label => :label_subtask_plural add_available_filter "child_id", :type => :tree, :label => :label_subtask_plural
@ -279,7 +290,9 @@ class IssueQuery < Query
if User.current.allowed_to?(:set_issues_private, nil, :global => true) || if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
User.current.allowed_to?(:set_own_issues_private, nil, :global => true) User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
@available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private", :groupable => true) @available_columns <<
QueryColumn.new(:is_private,
:sortable => "#{Issue.table_name}.is_private", :groupable => true)
end end
disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')} disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
@ -352,7 +365,11 @@ class IssueQuery < Query
limit(options[:limit]). limit(options[:limit]).
offset(options[:offset]) offset(options[:offset])
scope = scope.preload([:tracker, :author, :assigned_to, :fixed_version, :category, :attachments] & columns.map(&:name)) scope =
scope.preload(
[:tracker, :author, :assigned_to, :fixed_version,
:category, :attachments] & columns.map(&:name)
)
if has_custom_field_column? if has_custom_field_column?
scope = scope.preload(:custom_values) scope = scope.preload(:custom_values)
end end
@ -549,8 +566,10 @@ class IssueQuery < Query
def sql_for_is_private_field(field, operator, value) def sql_for_is_private_field(field, operator, value)
op = (operator == "=" ? 'IN' : 'NOT IN') op = (operator == "=" ? 'IN' : 'NOT IN')
va = value.map {|v| v == '0' ? self.class.connection.quoted_false : self.class.connection.quoted_true}.uniq.join(',') va =
value.map do |v|
v == '0' ? self.class.connection.quoted_false : self.class.connection.quoted_true
end.uniq.join(',')
"#{Issue.table_name}.is_private #{op} (#{va})" "#{Issue.table_name}.is_private #{op} (#{va})"
end end