Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 13:30:28 +01:00
Code Issues Packages Projects Releases Activity

code cleanup: rubocop: fix Style/ParenthesesAroundCondition in app/models/time_entry.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18834 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2019-10-22 15:54:37 +00:00
parent 48b2c8bc36
commit b6604ec751
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@@ -1144,7 +1144,6 @@ Style/ParallelAssignment:
Style/ParenthesesAroundCondition:
Exclude:
- 'app/models/repository/subversion.rb'
- 'app/models/time_entry.rb'
- 'app/models/wiki_page.rb'
- 'lib/diff.rb'
- 'lib/redmine/helpers/gantt.rb'

4
app/models/time_entry.rb
View File

@@ -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