Move custom field classes to a method (#30994).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17937 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 6bd8e292783bbd2fc7643f8d89c16ecda03b13b9..a3e655a302cad07933c12751e8bb5bd6cffa3ba8 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -243,9 +243,8 @@ module IssuesHelper
     half = (values.size / 2.0).ceil
     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), custom_field_value_tag(value), :class => css
+        rows.send m, custom_field_name_tag(value.custom_field), custom_field_value_tag(value), :class => value.custom_field.css_classes
       end
     end
   end
@@ -263,7 +262,7 @@ module IssuesHelper
           content_tag('hr') +
           content_tag('p', content_tag('strong', custom_field_name_tag(value.custom_field) )) +
           content_tag('div', attr_value_tag, class: 'value')
-      s << content_tag('div', content, class: "cf_#{value.custom_field.id} attribute")
+      s << content_tag('div', content, class: "#{value.custom_field.css_classes} attribute")
     end
     s
   end

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 1c71dfad9075a19e66ffd376ed2e545800a79ea2..25e9009d8ee20923576f2f6ae87d0e09bb6080ac 100644 (file)
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -301,6 +301,10 @@ class CustomField < ActiveRecord::Base
     super(attr_name, *args)
   end
 
+  def css_classes
+    "cf_#{id}"
+  end
+
   protected
 
   # Removes multiple values for the custom field after setting the multiple attribute to false

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index 7919472af0e6a22c3c5cb7f84617894b2051e4f6..43e8ce33efc35a61a80649eba4440d378ac3e9c6 100644 (file)
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -104,7 +104,7 @@
   <% end %>
 
   <% @options_by_custom_field.each do |field, options| %>
-    <li class="folder cf_<%= field.id %>">
+    <li class="folder <%= field.css_classes %>">
       <a href="#" class="submenu"><%= field.name %></a>
       <ul>
       <% options.each do |text, value| %>

diff --git a/app/views/context_menus/time_entries.html.erb b/app/views/context_menus/time_entries.html.erb
index 9d999d95e5eda248e8f6291b3c8ff06c08b334bf..0f40706f45bb0a220228af46113c21689a5b5209 100644 (file)
--- a/app/views/context_menus/time_entries.html.erb
+++ b/app/views/context_menus/time_entries.html.erb
@@ -22,7 +22,7 @@
   <% end %>
 
   <% @options_by_custom_field.each do |field, options| %>
-    <li class="folder cf_<%= field.id %>">
+    <li class="folder <%= field.css_classes %>">
       <a href="#" class="submenu"><%= field.name %></a>
       <ul>
       <% options.each do |text, value| %>

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index da1c53d98dc26b039d34065ff6d8ace98cd64329..14fd0817f39e5157b244d308ae67f9f0ac99c7fa 100644 (file)
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -30,7 +30,7 @@
     <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to_if uri_with_safe_scheme?(@project.homepage), @project.homepage, @project.homepage %></li>
   <% end %>
   <% render_custom_field_values(@project) do |custom_field, formatted| %>
-    <li class="cf_<%= custom_field.id %>"><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
+    <li class="<%= custom_field.css_classes %>"><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
   <% end %>
   </ul>
   <% end %>

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 7092518d2650bbd97207f952600e0386784d5bca..c5c17000b592f651fcae3411ec45807b7b770011 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -13,7 +13,7 @@
   <% end %>
   <% @user.visible_custom_field_values.each do |custom_value| %>
   <% if !custom_value.value.blank? %>
-    <li class="cf_<%= custom_value.custom_field.id %>"><%= custom_value.custom_field.name %>: <%= show_value(custom_value) %></li>
+    <li class="<%= custom_value.custom_field.css_classes %>"><%= custom_value.custom_field.name %>: <%= show_value(custom_value) %></li>
   <% end %>
   <% end %>
     <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>