mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-31 11:37:14 +00:00
Patch by Go MAEDA (@maeda). git-svn-id: https://svn.redmine.org/redmine/trunk@22848 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
6a4abab8ce
commit
3acc94914f
@ -40,6 +40,16 @@ module ProjectsQueriesHelper
|
||||
get_project_status_label[column.value_object(item)]
|
||||
when :parent_id
|
||||
link_to_project(item.parent) unless item.parent.nil?
|
||||
when :last_activity_date
|
||||
formatted_value = super
|
||||
if value.present? && formatted_value.present?
|
||||
link_to(
|
||||
formatted_value,
|
||||
project_activity_path(item, :from => User.current.time_to_date(value))
|
||||
)
|
||||
else
|
||||
formatted_value
|
||||
end
|
||||
else
|
||||
super
|
||||
end
|
||||
|
||||
@ -260,7 +260,10 @@ class ProjectsControllerTest < Redmine::ControllerTest
|
||||
assert_response :success
|
||||
end
|
||||
assert_equal ['Name', 'Description', 'Last activity'], columns_in_list
|
||||
assert_select 'tr#project-1 td.last_activity_date', :text => format_time(Journal.find(3).created_on)
|
||||
activity_time = Journal.find(3).created_on
|
||||
assert_select "tr#project-1 td.last_activity_date a[href=?]",
|
||||
project_activity_path(Project.find(1), :from => User.current.time_to_date(activity_time)),
|
||||
:text => format_time(activity_time)
|
||||
assert_select 'tr#project-4 td.last_activity_date', :text => ''
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user