diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index fe3d81a0a..181907e4d 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -127,8 +127,8 @@ module IssuesHelper content_tag('td', check_box_tag("ids[]", other_issue.id, false, :id => nil), :class => 'checkbox') + content_tag('td', relation.to_s(@issue) {|other| link_to_issue(other, :project => Setting.cross_project_issue_relations?)}.html_safe, :class => 'subject', :style => 'width: 50%') + content_tag('td', other_issue.status, :class => 'status') + - content_tag('td', other_issue.start_date, :class => 'start_date') + - content_tag('td', other_issue.due_date, :class => 'due_date') + + content_tag('td', format_date(other_issue.start_date), :class => 'start_date') + + content_tag('td', format_date(other_issue.due_date), :class => 'due_date') + content_tag('td', other_issue.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(other_issue.done_ratio), :class=> 'done_ratio') + content_tag('td', link, :class => 'buttons'), :id => "relation-#{relation.id}", diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index a7664c048..74f5e8ef5 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1754,6 +1754,21 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success end + def test_show_should_format_related_issues_dates + with_settings :date_format => '%d/%m/%Y' do + issue = Issue.generate!(:start_date => '2018-11-29', :due_date => '2018-12-01') + IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => issue, :relation_type => 'relates') + + get :show, :params => { + :id => 1 + } + assert_response :success + + assert_select '#relations td.start_date', :text => '29/11/2018' + assert_select '#relations td.due_date', :text => '01/12/2018' + end + end + def test_show_should_not_disclose_relations_to_invisible_issues Setting.cross_project_issue_relations = '1' IssueRelation.create!(:issue_from => Issue.find(1), :issue_to => Issue.find(2), :relation_type => 'relates')