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

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20423 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-18 16:16:15 +00:00
parent 675ec6f929
commit 046c0c4729
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/principal.rb
View File

@ -39,7 +39,7 @@ class Principal < ActiveRecord::Base
validate :validate_status
# Groups and active users
scope :active, lambda { where(:status => STATUS_ACTIVE) }
scope :active, lambda {where(:status => STATUS_ACTIVE)}
scope :visible, (lambda do |*args|
user = args.first || User.current
@ -76,7 +76,7 @@ class Principal < ActiveRecord::Base
sql << " OR #{table_name}.id IN (SELECT user_id FROM #{EmailAddress.table_name} WHERE LOWER(address) LIKE LOWER(:p))"
params = {:p => pattern}
tokens = q.split(/\s+/).reject(&:blank?).map { |token| "%#{token}%" }
tokens = q.split(/\s+/).reject(&:blank?).map {|token| "%#{token}%"}
if tokens.present?
sql << ' OR ('
sql << tokens.map.with_index do |token, index|
@ -111,10 +111,10 @@ class Principal < ActiveRecord::Base
where("#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
end
end)
scope :sorted, lambda { order(*Principal.fields_for_order_statement)}
scope :sorted, lambda {order(*Principal.fields_for_order_statement)}
# Principals that can be added as watchers
scope :assignable_watchers, lambda { active.visible.where(:type => ['User', 'Group']) }
scope :assignable_watchers, lambda {active.visible.where(:type => ['User', 'Group'])}
before_create :set_default_empty_values
before_destroy :nullify_projects_default_assigned_to