meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r22311 from trunk to 5.0-stable (#39079).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22312 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-09-20 04:47:15 +00:00
parent f0128ea71c
commit 19edb7df96
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/time_entry.rb
View File

@ -181,7 +181,7 @@ class TimeEntry < ActiveRecord::Base
end
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
if spent_on && spent_on_changed? && user
errors.add :base, I18n.t(:error_spent_on_future_date) if !Setting.timelog_accept_future_dates? && (spent_on > user.today)
end
end

10
test/unit/time_entry_test.rb
View File

@ -156,6 +156,16 @@ class TimeEntryTest < ActiveSupport::TestCase
end
end
def test_should_require_spent_on
with_settings :timelog_accept_future_dates => '0' do
entry = TimeEntry.find(1)
entry.spent_on = ''
assert !entry.save
assert entry.errors[:spent_on].present?
end
end
def test_spent_on_with_blank
c = TimeEntry.new
c.spent_on = ''