From 8c6982b679816f4c603891f470714cc48c39f983 Mon Sep 17 00:00:00 2001
From: Marius BALTEANU <marius.balteanu@zitec.com>
Date: Thu, 7 Mar 2019 20:52:55 +0000
Subject: [PATCH] Move custom field classes to a method

---
 app/helpers/issues_helper.rb                  | 5 ++---
 app/models/custom_field.rb                    | 4 ++++
 app/views/context_menus/issues.html.erb       | 2 +-
 app/views/context_menus/time_entries.html.erb | 2 +-
 app/views/projects/show.html.erb              | 2 +-
 app/views/users/show.html.erb                 | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 6bd8e29..a3e655a 100644
--- 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 1c71dfa..25e9009 100644
--- 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 7919472..43e8ce3 100644
--- 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 9d999d9..0f40706 100644
--- 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 da1c53d..14fd081 100644
--- 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 7092518..c5c1700 100644
--- 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>
-- 
2.1.4