Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 22:05:56 +01:00
Code Issues Packages Projects Releases Activity

Fixed rendering of multivalued custom fields in the issue history (#19225).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14054 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-08 09:07:20 +00:00
parent 730bba8130
commit 76a4668f52
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/issues_helper.rb
View File

@@ -320,17 +320,21 @@ module IssuesHelper
end
strings << show_detail(detail, no_html, options)
end
if values_by_field.present?
multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
values_by_field.each do |field, changes|
detail = JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s)
detail.instance_variable_set "@custom_field", field
if changes[:added].any?
detail = multiple_values_detail.new('cf', field.id.to_s, field)
detail.value = changes[:added]
strings << show_detail(detail, no_html, options)
elsif changes[:deleted].any?
end
if changes[:deleted].any?
detail = multiple_values_detail.new('cf', field.id.to_s, field)
detail.old_value = changes[:deleted]
strings << show_detail(detail, no_html, options)
end
end
end
strings
end

37
test/unit/helpers/issues_helper_test.rb
View File

@@ -296,6 +296,43 @@ class IssuesHelperTest < ActionView::TestCase
assert_equal "<strong>Precedes</strong> deleted (<i>Issue ##{issue.id}</i>)", show_detail(detail, false)
end
def test_details_to_strings_with_multiple_values_removed_from_custom_field
field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
details = []
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '1', :value => nil)
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '3', :value => nil)
assert_equal ["User deleted (Dave Lopper, Redmine Admin)"], details_to_strings(details, true)
assert_equal ["<strong>User</strong> deleted (<del><i>Dave Lopper, Redmine Admin</i></del>)"], details_to_strings(details, false)
end
def test_details_to_strings_with_multiple_values_added_to_custom_field
field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
details = []
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '1')
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '3')
assert_equal ["User Dave Lopper, Redmine Admin added"], details_to_strings(details, true)
assert_equal ["<strong>User</strong> <i>Dave Lopper, Redmine Admin</i> added"], details_to_strings(details, false)
end
def test_details_to_strings_with_multiple_values_added_and_removed_from_custom_field
field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
details = []
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '1')
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '2', :value => nil)
details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '3', :value => nil)
assert_equal [
"User Redmine Admin added",
"User deleted (Dave Lopper, John Smith)"
], details_to_strings(details, true)
assert_equal [
"<strong>User</strong> <i>Redmine Admin</i> added",
"<strong>User</strong> deleted (<del><i>Dave Lopper, John Smith</i></del>)"
], details_to_strings(details, false)
end
def test_find_name_by_reflection_should_return_nil_for_missing_record
assert_nil find_name_by_reflection('status', 99)
end