##// END OF EJS Templates
Prepends issue numbers with a number sign (#1005)....
Jean-Philippe Lang -
r11710:d90f46a5da07
parent child
Show More
@@ -309,11 +309,11 module IssuesHelper
309 when 'relation'
309 when 'relation'
310 if detail.value && !detail.old_value
310 if detail.value && !detail.old_value
311 rel_issue = Issue.visible.find_by_id(detail.value)
311 rel_issue = Issue.visible.find_by_id(detail.value)
312 value = rel_issue.nil? ? "#{l(:label_issue)} #{detail.value}" :
312 value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
313 (no_html ? rel_issue : link_to_issue(rel_issue))
313 (no_html ? rel_issue : link_to_issue(rel_issue))
314 elsif detail.old_value && !detail.value
314 elsif detail.old_value && !detail.value
315 rel_issue = Issue.visible.find_by_id(detail.old_value)
315 rel_issue = Issue.visible.find_by_id(detail.old_value)
316 old_value = rel_issue.nil? ? "#{l(:label_issue)} #{detail.old_value}" :
316 old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
317 (no_html ? rel_issue : link_to_issue(rel_issue))
317 (no_html ? rel_issue : link_to_issue(rel_issue))
318 end
318 end
319 label = l(detail.prop_key.to_sym)
319 label = l(detail.prop_key.to_sym)
@@ -223,8 +223,8 class IssuesHelperTest < ActionView::TestCase
223 detail = JournalDetail.new(:property => 'relation',
223 detail = JournalDetail.new(:property => 'relation',
224 :prop_key => 'label_precedes',
224 :prop_key => 'label_precedes',
225 :value => non_existed_issue_number)
225 :value => non_existed_issue_number)
226 assert_equal "Precedes Issue #{non_existed_issue_number} added", show_detail(detail, true)
226 assert_equal "Precedes Issue ##{non_existed_issue_number} added", show_detail(detail, true)
227 assert_equal "<strong>Precedes</strong> <i>Issue #{non_existed_issue_number}</i> added", show_detail(detail, false)
227 assert_equal "<strong>Precedes</strong> <i>Issue ##{non_existed_issue_number}</i> added", show_detail(detail, false)
228 end
228 end
229
229
230 def test_show_detail_relation_added_should_not_disclose_issue_that_is_not_visible
230 def test_show_detail_relation_added_should_not_disclose_issue_that_is_not_visible
@@ -233,8 +233,8 class IssuesHelperTest < ActionView::TestCase
233 :prop_key => 'label_precedes',
233 :prop_key => 'label_precedes',
234 :value => issue.id)
234 :value => issue.id)
235
235
236 assert_equal "Precedes Issue #{issue.id} added", show_detail(detail, true)
236 assert_equal "Precedes Issue ##{issue.id} added", show_detail(detail, true)
237 assert_equal "<strong>Precedes</strong> <i>Issue #{issue.id}</i> added", show_detail(detail, false)
237 assert_equal "<strong>Precedes</strong> <i>Issue ##{issue.id}</i> added", show_detail(detail, false)
238 end
238 end
239
239
240 def test_show_detail_delete_relation
240 def test_show_detail_delete_relation
@@ -249,8 +249,8 class IssuesHelperTest < ActionView::TestCase
249 detail = JournalDetail.new(:property => 'relation',
249 detail = JournalDetail.new(:property => 'relation',
250 :prop_key => 'label_precedes',
250 :prop_key => 'label_precedes',
251 :old_value => non_existed_issue_number)
251 :old_value => non_existed_issue_number)
252 assert_equal "Precedes deleted (Issue 9999)", show_detail(detail, true)
252 assert_equal "Precedes deleted (Issue #9999)", show_detail(detail, true)
253 assert_equal "<strong>Precedes</strong> deleted (<i>Issue 9999</i>)", show_detail(detail, false)
253 assert_equal "<strong>Precedes</strong> deleted (<i>Issue #9999</i>)", show_detail(detail, false)
254 end
254 end
255
255
256 def test_show_detail_relation_deleted_should_not_disclose_issue_that_is_not_visible
256 def test_show_detail_relation_deleted_should_not_disclose_issue_that_is_not_visible
@@ -259,7 +259,7 class IssuesHelperTest < ActionView::TestCase
259 :prop_key => 'label_precedes',
259 :prop_key => 'label_precedes',
260 :old_value => issue.id)
260 :old_value => issue.id)
261
261
262 assert_equal "Precedes deleted (Issue #{issue.id})", show_detail(detail, true)
262 assert_equal "Precedes deleted (Issue ##{issue.id})", show_detail(detail, true)
263 assert_equal "<strong>Precedes</strong> deleted (<i>Issue #{issue.id}</i>)", show_detail(detail, false)
263 assert_equal "<strong>Precedes</strong> deleted (<i>Issue ##{issue.id}</i>)", show_detail(detail, false)
264 end
264 end
265 end
265 end
General Comments 0
You need to be logged in to leave comments. Login now