Redmine 2.x support - Initial work

app/helpers/deliverables_helper.rb

@@ -5,7 +5,7 @@ module DeliverablesHelper
   # TODO Later: Refactor since observers are not used anymore
   def field_with_budget_observer_and_totals(form, object, field, percent_field, default_value='')
     content_tag(:tr,
-                content_tag(:td, "<label for='deliverable_#{field.to_s}'>#{l_field(field, 'field_')}</label>") +
+                content_tag(:td, "<label for='deliverable_#{field.to_s}'>#{l_field(field, 'field_')}</label>".html_safe) +
                 content_tag(:td, number_or_percent_field(object, field, percent_field, default_value, :size => 7)) +
                 content_tag(:td,
                             content_tag(:span,
@@ -15,27 +15,27 @@ module DeliverablesHelper
                                         ),
                             :class => "calculation-column"
                             ))
-                            
+
   end
 
   def number_or_percent_field(object, number_field, percent_field, default_value, options)
     # Build a text_field by hand named after the number field but with the percent_field and % as the value
-    return text_field_tag('deliverable_' + number_field.to_s, 
+    return text_field_tag('deliverable_' + number_field.to_s,
                           object.read_attribute(percent_field).to_s + "%",
                           options.merge({ :name => "deliverable[#{number_field.to_s}]"})) unless object.read_attribute(percent_field).blank?
-    
+
     # Number and fallback with no values
     value = object.read_attribute(number_field) || default_value || ''
     return text_field(:deliverable, number_field, options.merge({ :value => value}))
   end
-  
+
   # Helper to generate a consistant HTML format for displaying basic data
   def paragraph_with_data(label, data)
     content_tag(:p,
                 content_tag(:span, label, :class => 'title') +
                 content_tag(:span, h(data), :class => 'data'))
   end
-  
+
   def row_with_data(label, data, css_class='')
     content_tag(:tr,
                 content_tag(:td, label, :class => 'title') +
@@ -51,7 +51,7 @@ module DeliverablesHelper
                             content_tag(:span, h(data1), :class => 'left-data') +
                             content_tag(:span, h(data2), :class => 'right-data'),
                             :class => 'fake-table'))
-                
+
   end
 
   # Helper to generate a consistant HTML format for displaying basic data
@@ -67,11 +67,11 @@ module DeliverablesHelper
   def allowed_management?
     return User.current.allowed_to?(:manage_budget, @project)
   end
-  
+
   def l_field(field, prefix='')
     l((prefix + field.to_s).to_sym)
   end
-  
+
   def toggle_arrows(deliverable_id)
     open_js = "expandRow(#{deliverable_id})"
     close_js = "collapseRow(#{deliverable_id})"
@@ -79,7 +79,7 @@ module DeliverablesHelper
     return toggle_arrow(deliverable_id, "toggle-arrow-closed.gif", open_js, false) +
       toggle_arrow(deliverable_id, "toggle-arrow-open.gif", close_js, true)
   end
-  
+
   def toggle_arrow(deliverable_id, image, js, hide=false)
     style = "display:none;" if hide
     style ||= ''
@@ -89,9 +89,9 @@ module DeliverablesHelper
                 :class => "toggle toggle_" + deliverable_id.to_s,
                 :style => style
                 )
-    
+
   end
-  
+
   def number_or_percent(number_field, percent_field)
     return number_to_currency(number_field, :unit => l(:label_currency), :precision => 0) unless number_field.blank?
     return number_to_percentage(percent_field, :precision => 0) unless percent_field.blank?