@@ -290,7 +290,7 module IssuesHelper | |||||
290 | unless no_html |
|
290 | unless no_html | |
291 | label = content_tag('strong', label) |
|
291 | label = content_tag('strong', label) | |
292 | old_value = content_tag("i", h(old_value)) if detail.old_value |
|
292 | old_value = content_tag("i", h(old_value)) if detail.old_value | |
293 |
old_value = content_tag(" |
|
293 | old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank? | |
294 | if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) |
|
294 | if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) | |
295 | # Link to the attachment if it has not been removed |
|
295 | # Link to the attachment if it has not been removed | |
296 | value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) |
|
296 | value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) |
@@ -8,7 +8,7 | |||||
8 | <% end %> |
|
8 | <% end %> | |
9 | <span id="attachments_fields"> |
|
9 | <span id="attachments_fields"> | |
10 | <span> |
|
10 | <span> | |
11 |
<%= file_field_tag 'attachments[1][file]', : |
|
11 | <%= file_field_tag 'attachments[1][file]', :id => nil, :class => 'file', | |
12 | :onchange => "checkFileSize(this, #{Setting.attachment_max_size.to_i.kilobytes}, '#{escape_javascript(l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)))}');" -%> |
|
12 | :onchange => "checkFileSize(this, #{Setting.attachment_max_size.to_i.kilobytes}, '#{escape_javascript(l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)))}');" -%> | |
13 | <%= text_field_tag 'attachments[1][description]', '', :id => nil, :class => 'description', :maxlength => 255, :placeholder => l(:label_optional_description) %> |
|
13 | <%= text_field_tag 'attachments[1][description]', '', :id => nil, :class => 'description', :maxlength => 255, :placeholder => l(:label_optional_description) %> | |
14 | <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %> |
|
14 | <%= link_to_function(image_tag('delete.png'), 'removeFileField(this)', :title => (l(:button_delete))) %> |
@@ -32,7 +32,8 class IssuesHelperTest < ActionView::TestCase | |||||
32 | :enabled_modules, |
|
32 | :enabled_modules, | |
33 | :workflows, |
|
33 | :workflows, | |
34 | :custom_fields, |
|
34 | :custom_fields, | |
35 | :attachments |
|
35 | :attachments, | |
|
36 | :versions | |||
36 |
|
37 | |||
37 | def setup |
|
38 | def setup | |
38 | super |
|
39 | super | |
@@ -104,7 +105,7 class IssuesHelperTest < ActionView::TestCase | |||||
104 | html = show_detail(@detail, false) |
|
105 | html = show_detail(@detail, false) | |
105 |
|
106 | |||
106 | assert_include '<strong>% Done</strong>', html |
|
107 | assert_include '<strong>% Done</strong>', html | |
107 |
assert_include '< |
|
108 | assert_include '<del><i>50</i></del>', html | |
108 | end |
|
109 | end | |
109 | end |
|
110 | end | |
110 |
|
111 |
General Comments 0
You need to be logged in to leave comments.
Login now