summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-22 15:54:37 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-10-22 15:54:37 +0000
commitb6604ec7510e295036920ccc30d28c0061f0885c (patch)
tree17ade5e2917b47456b217aac8ea6d3d5f31abfb5 /app/models
parent48b2c8bc3693af18b5dd41b6161333d7e9e698f0 (diff)
downloadredmine-b6604ec7510e295036920ccc30d28c0061f0885c.tar.gz
redmine-b6604ec7510e295036920ccc30d28c0061f0885c.zip
code cleanup: rubocop: fix Style/ParenthesesAroundCondition in app/models/time_entry.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18834 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/time_entry.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index d2661d078..e376e0ffd 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -142,11 +142,11 @@ class TimeEntry < ActiveRecord::Base
end
end
errors.add :project_id, :invalid if project.nil?
- errors.add :user_id, :invalid if (user_id != author_id && !self.assignable_users.map(&:id).include?(user_id))
+ errors.add :user_id, :invalid if user_id != author_id && !self.assignable_users.map(&:id).include?(user_id)
errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project) || @invalid_issue_id
errors.add :activity_id, :inclusion if activity_id_changed? && project && !project.activities.include?(activity)
if spent_on_changed? && user
- errors.add :base, I18n.t(:error_spent_on_future_date) if (!Setting.timelog_accept_future_dates? && (spent_on > user.today))
+ errors.add :base, I18n.t(:error_spent_on_future_date) if !Setting.timelog_accept_future_dates? && (spent_on > user.today)
end
end