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

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20397 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-16 12:22:32 +00:00
parent 14943d8d55
commit cf30b49e0e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/time_entry.rb
View File

@ -48,8 +48,8 @@ class TimeEntry < ActiveRecord::Base
:scope => proc { joins(:project).preload(:project) }
validates_presence_of :author_id, :user_id, :activity_id, :project_id, :hours, :spent_on
validates_presence_of :issue_id, :if => lambda { Setting.timelog_required_fields.include?('issue_id') }
validates_presence_of :comments, :if => lambda { Setting.timelog_required_fields.include?('comments') }
validates_presence_of :issue_id, :if => lambda {Setting.timelog_required_fields.include?('issue_id')}
validates_presence_of :comments, :if => lambda {Setting.timelog_required_fields.include?('comments')}
validates_numericality_of :hours, :allow_nil => true, :message => :invalid
validates_length_of :comments, :maximum => 1024, :allow_nil => true
validates :spent_on, :date => true
@ -218,7 +218,7 @@ class TimeEntry < ActiveRecord::Base
users = []
if project
users = project.members.active.preload(:user)
users = users.map(&:user).select{ |u| u.allowed_to?(:log_time, project) }
users = users.map(&:user).select{|u| u.allowed_to?(:log_time, project)}
end
users << User.current if User.current.logged? && !users.include?(User.current)
users