]> source.dussan.org Git - redmine.git/commitdiff
Use #issue_fields_rows to render custom fields values.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 8 Nov 2015 10:35:52 +0000 (10:35 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 8 Nov 2015 10:35:52 +0000 (10:35 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@14846 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/issues_helper.rb

index 42e93655b9dc2c8f95bc023f51a28cbfda89ce41..9288db5ab592afb857aef9c633f581bf0d5db677 100644 (file)
@@ -200,7 +200,7 @@ module IssuesHelper
     end
 
     def cells(label, text, options={})
-      content_tag('th', "#{label}:", options) + content_tag('td', text, options)
+      content_tag('th', label + ":", options) + content_tag('td', text, options)
     end
   end
 
@@ -213,22 +213,14 @@ module IssuesHelper
   def render_custom_fields_rows(issue)
     values = issue.visible_custom_field_values
     return if values.empty?
-    ordered_values = []
     half = (values.size / 2.0).ceil
-    half.times do |i|
-      ordered_values << values[i]
-      ordered_values << values[i + half]
-    end
-    s = "<tr>\n"
-    n = 0
-    ordered_values.compact.each do |value|
-      css = "cf_#{value.custom_field.id}"
-      s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
-      s << "\t<th class=\"#{css}\">#{ custom_field_name_tag(value.custom_field) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n"
-      n += 1
+    issue_fields_rows do |rows|
+      values.each_with_index do |value, i|
+        css = "cf_#{value.custom_field.id}"
+        m = (i < half ? :left : :right)
+        rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css
+      end
     end
-    s << "</tr>\n"
-    s.html_safe
   end
 
   # Returns the path for updating the issue form