meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 17:01:13 +00:00
Code Issues Releases Wiki Activity

remove spaces inside {} of app/models/query.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19880 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-07-11 01:21:27 +00:00
parent 8402e08034
commit 457b39a980
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/models/query.rb
View File

@ -235,7 +235,7 @@ class Query < ActiveRecord::Base
validates_presence_of :name validates_presence_of :name
validates_length_of :name, :maximum => 255 validates_length_of :name, :maximum => 255
validates :visibility, :inclusion => { :in => [VISIBILITY_PUBLIC, VISIBILITY_ROLES, VISIBILITY_PRIVATE] } validates :visibility, :inclusion => {:in => [VISIBILITY_PUBLIC, VISIBILITY_ROLES, VISIBILITY_PRIVATE]}
validate :validate_query_filters validate :validate_query_filters
validate do |query| validate do |query|
errors.add(:base, l(:label_role_plural) + ' ' + l('activerecord.errors.messages.blank')) if query.visibility == VISIBILITY_ROLES && roles.blank? errors.add(:base, l(:label_role_plural) + ' ' + l('activerecord.errors.messages.blank')) if query.visibility == VISIBILITY_ROLES && roles.blank?
@ -444,9 +444,13 @@ class Query < ActiveRecord::Base
if values_for(field) if values_for(field)
case type_for(field) case type_for(field)
when :integer when :integer
add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !/\A[+-]?\d+(,[+-]?\d+)*\z/.match?(v) } if values_for(field).detect {|v| v.present? && !/\A[+-]?\d+(,[+-]?\d+)*\z/.match?(v)}
add_filter_error(field, :invalid)
end
when :float when :float
add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !/\A[+-]?\d+(\.\d*)?\z/.match?(v) } if values_for(field).detect {|v| v.present? && !/\A[+-]?\d+(\.\d*)?\z/.match?(v)}
add_filter_error(field, :invalid)
end
when :date, :date_past when :date, :date_past
case operator_for(field) case operator_for(field)
when "=", ">=", "<=", "><" when "=", ">=", "<=", "><"
@ -454,7 +458,9 @@ class Query < ActiveRecord::Base
v.present? && (!/\A\d{4}-\d{2}-\d{2}(T\d{2}((:)?\d{2}){0,2}(Z|\d{2}:?\d{2})?)?\z/.match?(v) || parse_date(v).nil?) v.present? && (!/\A\d{4}-\d{2}-\d{2}(T\d{2}((:)?\d{2}){0,2}(Z|\d{2}:?\d{2})?)?\z/.match?(v) || parse_date(v).nil?)
} }
when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-" when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !/^\d+$/.match?(v) } if values_for(field).detect {|v| v.present? && !/^\d+$/.match?(v)}
add_filter_error(field, :invalid)
end
end end
end end
end end
@ -538,7 +544,7 @@ class Query < ActiveRecord::Base
end end
def subproject_values def subproject_values
project.descendants.visible.collect{|s| [s.name, s.id.to_s] } project.descendants.visible.collect{|s| [s.name, s.id.to_s]}
end end
def principals def principals
@ -566,7 +572,9 @@ class Query < ActiveRecord::Base
def author_values def author_values
author_values = [] author_values = []
author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged? author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
author_values += users.sort_by(&:status).collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")] } author_values +=
users.sort_by(&:status).
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
author_values << [l(:label_user_anonymous), User.anonymous.id.to_s] author_values << [l(:label_user_anonymous), User.anonymous.id.to_s]
author_values author_values
end end
@ -574,7 +582,9 @@ class Query < ActiveRecord::Base
def assigned_to_values def assigned_to_values
assigned_to_values = [] assigned_to_values = []
assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged? assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
assigned_to_values += (Setting.issue_group_assignment? ? principals : users).sort_by(&:status).collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")] } assigned_to_values +=
(Setting.issue_group_assignment? ? principals : users).sort_by(&:status).
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
assigned_to_values assigned_to_values
end end
@ -585,7 +595,8 @@ class Query < ActiveRecord::Base
else else
versions = Version.visible.to_a versions = Version.visible.to_a
end end
Version.sort_by_status(versions).collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s, l("version_status_#{s.status}")] } Version.sort_by_status(versions).
collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s, l("version_status_#{s.status}")]}
end end
# Returns a scope of issue statuses that are available as columns for filters # Returns a scope of issue statuses that are available as columns for filters
@ -600,7 +611,11 @@ class Query < ActiveRecord::Base
def watcher_values def watcher_values
watcher_values = [["<< #{l(:label_me)} >>", "me"]] watcher_values = [["<< #{l(:label_me)} >>", "me"]]
watcher_values += principals.sort_by(&:status).collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")] } if User.current.allowed_to?(:view_issue_watchers, self.project) if User.current.allowed_to?(:view_issue_watchers, self.project)
watcher_values +=
principals.sort_by(&:status).
collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
end
watcher_values watcher_values
end end
@ -738,7 +753,7 @@ class Query < ActiveRecord::Base
# preserve the column_names order # preserve the column_names order
cols = (has_default_columns? ? default_columns_names : column_names).collect do |name| cols = (has_default_columns? ? default_columns_names : column_names).collect do |name|
available_columns.find { |col| col.name == name } available_columns.find {|col| col.name == name}
end.compact end.compact
available_columns.select(&:frozen?) | cols available_columns.select(&:frozen?) | cols
end end
@ -777,8 +792,8 @@ class Query < ActiveRecord::Base
def column_names=(names) def column_names=(names)
if names if names
names = names.select {|n| n.is_a?(Symbol) || !n.blank? } names = names.select {|n| n.is_a?(Symbol) || !n.blank?}
names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym}
if names.delete(:all_inline) if names.delete(:all_inline)
names = available_inline_columns.map(&:name) | names names = available_inline_columns.map(&:name) | names
end end