jro_apps/redmine Commit - r13772:ca2be43456cd

Include custom fields description in project settings and issue view (#19296)....

Jean-Philippe Lang -

r13772:ca2be43456cd

parent child

Context file:

r13772:ca2be43456cd

app/helpers/custom_fields_helper.rb +7 -2

                   :class => "#{custom_value.custom_field.field_format}_cf"
               end
+              # Return custom field name tag
+              def custom_field_name_tag(custom_field)
+                title = custom_field.description.presence
+                content_tag 'span', custom_field.name, :title => title
+              end
               # Return custom field label tag
               def custom_field_label_tag(name, custom_value, options={})
                 required = options[:required] || custom_value.custom_field.is_required?
-                title = custom_value.custom_field.description.presence
+                content = custom_field_name_tag custom_value.custom_field
-                content = content_tag 'span', custom_value.custom_field.name, :title => title
                 content_tag "label", content +
                   (required ? " <span class=\"required\">*</span>".html_safe : ""),

app/helpers/issues_helper.rb +1 -1

                 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}\">#{ h(value.custom_field.name) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n"
+                  s << "\t<th class=\"#{css}\">#{ custom_field_name_tag(value.custom_field) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"

app/views/projects/_form.html.erb +1 -1

               <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field),
                     :disabled => (custom_field.is_for_all? ? "disabled" : nil),
                     :id => nil %>
-              <%= custom_field.name %>
+              <%= custom_field_name_tag(custom_field) %>
               </label>
             <% end %>
             <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>

public/stylesheets/application.css +1 -2

             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
-            abbr  { border-bottom: 1px dotted; cursor: help; }
+            abbr, span[title] { border-bottom: 1px dotted #aaa; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             .tabular input, .tabular select {max-width:95%}
             .tabular textarea {width:95%; resize:vertical;}
-            .tabular span[title] {border-bottom:1px dotted #aaa;}
             .tabular label{
               font-weight: bold;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages