meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Add guard clause to time_tag method to handle nil time (#38139).

Browse Source 
Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@22022 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-01-02 06:56:47 +00:00
parent bbd8e5a08a
commit 025323f5ba
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -694,6 +694,8 @@ module ApplicationHelper
end
def time_tag(time)
return if time.nil?
text = distance_of_time_in_words(Time.now, time)
if @project
link_to(text,

16
test/helpers/application_helper_test.rb
View File

@ -2211,6 +2211,22 @@ class ApplicationHelperTest < Redmine::HelperTest
end
end
def test_time_tag
user = User.find(1)
user.pref.update(time_zone: 'UTC')
User.current = user
assert_nil time_tag(nil)
with_locale 'en' do
travel_to Time.zone.parse('2022-12-30T01:00:00Z') do
assert_equal "<abbr title=\"12/28/2022 01:00 AM\">2 days</abbr>", time_tag(2.days.ago)
@project = Project.find(1)
assert_equal "<a title=\"12/28/2022 01:00 AM\" href=\"/projects/ecookbook/activity?from=2022-12-28\">2 days</a>", time_tag(2.days.ago)
end
end
end
private
def wiki_links_with_special_characters