summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-11-04 20:17:44 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-11-04 20:17:44 +0000
commit984e5a36bbbcb963619d56a4221218650758c38a (patch)
tree6a316858b44569099335baf8961c6cb0650d8bf6
parentdb63f5a925f4e042d4df2567b2c4f081fa9a1816 (diff)
downloadredmine-984e5a36bbbcb963619d56a4221218650758c38a.tar.gz
redmine-984e5a36bbbcb963619d56a4221218650758c38a.zip
Fixed that parent column should not include issue subject (#13673).
git-svn-id: http://svn.redmine.org/redmine/trunk@13556 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/queries_helper.rb2
-rw-r--r--test/functional/issues_controller_test.rb11
2 files changed, 13 insertions, 0 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 75867ac12..9f6c07b36 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -97,6 +97,8 @@ module QueriesHelper
link_to value, issue_path(issue)
when :subject
link_to value, issue_path(issue)
+ when :parent
+ value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
when :description
issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
when :done_ratio
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index a95588cac..a21a468f2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -854,6 +854,17 @@ class IssuesControllerTest < ActionController::TestCase
assert_equal 'application/pdf', response.content_type
end
+ def test_index_with_parent_column
+ Issue.delete_all
+ parent = Issue.generate!
+ child = Issue.generate!(:parent_issue_id => parent.id)
+
+ get :index, :c => %w(parent)
+
+ assert_select 'td.parent', :text => "#{parent.tracker} ##{parent.id}"
+ assert_select 'td.parent a[title=?]', parent.subject
+ end
+
def test_index_send_html_if_query_is_invalid
get :index, :f => ['start_date'], :op => {:start_date => '='}
assert_equal 'text/html', @response.content_type