Defect #43409 » 0001-fix_show_nil_cf_progressbar_as_zero_percent.patch
| lib/redmine/field_format.rb | ||
|---|---|---|
| 1146 | 1146 | |
| 1147 | 1147 |
def formatted_value(view, custom_field, value, customized=nil, html=false) |
| 1148 | 1148 |
if html |
| 1149 |
text = "#{value}%"
|
|
| 1150 |
view.progress_bar(value.to_i, legend: (text if view.action_name == 'show')) |
|
| 1149 |
value_i = value.to_i |
|
| 1150 |
text = "#{value_i}%"
|
|
| 1151 |
view.progress_bar(value_i, legend: (text if view.action_name == 'show')) |
|
| 1151 | 1152 |
else |
| 1152 | 1153 |
value.to_s |
| 1153 | 1154 |
end |
| test/unit/lib/redmine/field_format/progressbar_format_test.rb | ||
|---|---|---|
| 124 | 124 |
assert formatted.html_safe? |
| 125 | 125 |
end |
| 126 | 126 | |
| 127 |
def test_formatted_value_with_html_true_and_nil_value_as_zero |
|
| 128 |
controller.action_name = 'show' |
|
| 129 |
expected = progress_bar(0, legend: '0%') |
|
| 130 |
formatted = @format.formatted_value(self, @field, nil, Issue.new, true) |
|
| 131 |
assert_equal expected, formatted |
|
| 132 |
assert formatted.html_safe? |
|
| 133 |
end |
|
| 134 | ||
| 127 | 135 |
def test_formatted_value_with_html_false |
| 128 | 136 |
formatted = @format.formatted_value(self, @field, 50, Issue.new, false) |
| 129 | 137 |
assert_equal '50', formatted |
- « Previous
- 1
- 2
- 3
- Next »