| @@ -309,11 +309,11 module IssuesHelper | |||
|
|
309 | 309 | when 'relation' |
|
|
310 | 310 | if detail.value && !detail.old_value |
|
|
311 | 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 | 313 | (no_html ? rel_issue : link_to_issue(rel_issue)) |
|
|
314 | 314 | elsif detail.old_value && !detail.value |
|
|
315 | 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 | 317 | (no_html ? rel_issue : link_to_issue(rel_issue)) |
|
|
318 | 318 | end |
|
|
319 | 319 | label = l(detail.prop_key.to_sym) |
| @@ -223,8 +223,8 class IssuesHelperTest < ActionView::TestCase | |||
|
|
223 | 223 | detail = JournalDetail.new(:property => 'relation', |
|
|
224 | 224 | :prop_key => 'label_precedes', |
|
|
225 | 225 | :value => non_existed_issue_number) |
|
|
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) | |
|
|
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) | |
|
|
228 | 228 | end |
|
|
229 | 229 | |
|
|
230 | 230 | def test_show_detail_relation_added_should_not_disclose_issue_that_is_not_visible |
| @@ -233,8 +233,8 class IssuesHelperTest < ActionView::TestCase | |||
|
|
233 | 233 | :prop_key => 'label_precedes', |
|
|
234 | 234 | :value => issue.id) |
|
|
235 | 235 | |
|
|
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) | |
|
|
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) | |
|
|
238 | 238 | end |
|
|
239 | 239 | |
|
|
240 | 240 | def test_show_detail_delete_relation |
| @@ -249,8 +249,8 class IssuesHelperTest < ActionView::TestCase | |||
|
|
249 | 249 | detail = JournalDetail.new(:property => 'relation', |
|
|
250 | 250 | :prop_key => 'label_precedes', |
|
|
251 | 251 | :old_value => non_existed_issue_number) |
|
|
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) | |
|
|
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) | |
|
|
254 | 254 | end |
|
|
255 | 255 | |
|
|
256 | 256 | def test_show_detail_relation_deleted_should_not_disclose_issue_that_is_not_visible |
| @@ -259,7 +259,7 class IssuesHelperTest < ActionView::TestCase | |||
|
|
259 | 259 | :prop_key => 'label_precedes', |
|
|
260 | 260 | :old_value => issue.id) |
|
|
261 | 261 | |
|
|
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) | |
|
|
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) | |
|
|
264 | 264 | end |
|
|
265 | 265 | end |
General Comments 0
You need to be logged in to leave comments.
Login now