jro_apps/redmine Commit - r9425:c085367bb63b

Adds css class to custom field input tags....

Jean-Philippe Lang -

r9425:c085367bb63b

parent child

Context file:

r9425:c085367bb63b

Collapse all files

app/helpers/custom_fields_helper.rb +15 -11

                  field_name << "[]" if custom_field.multiple?
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
+                 tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
                  field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                  case field_format.try(:edit_as)
                  when "date"
-                   text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
+                   text_field_tag(field_name, custom_value.value, tag_options.merge(:size => 10)) +
                    calendar_for(field_id)
                  when "text"
-                   text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
+                   text_area_tag(field_name, custom_value.value, tag_options.merge(:rows => 3))
                  when "bool"
-                   hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
+                   hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, tag_options)
                  when "list"
                    blank_option = ''
                    unless custom_field.multiple?
                      end
                    end
                    s = select_tag(field_name, blank_option.html_safe + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
-                     :id => field_id, :multiple => custom_field.multiple?)
+                     tag_options.merge(:multiple => custom_field.multiple?))
                    if custom_field.multiple?
                      s << hidden_field_tag(field_name, '')
                    end
                    s
                  else
-                   text_field_tag(field_name, custom_value.value, :id => field_id)
+                   text_field_tag(field_name, custom_value.value, tag_options)
                  end
                end
                  field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                  field_name << "[]" if custom_field.multiple?
                  field_id = "#{name}_custom_field_values_#{custom_field.id}"
+                 tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
                  field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                  case field_format.try(:edit_as)
                    when "date"
-                     text_field_tag(field_name, '', :id => field_id, :size => 10) +
+                     text_field_tag(field_name, '', tag_options.merge(:size => 10)) +
                      calendar_for(field_id)
                    when "text"
-                     text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%')
+                     text_area_tag(field_name, '', tag_options.merge(:rows => 3))
                    when "bool"
                      select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
                                                                 [l(:general_text_yes), '1'],
-                                                                [l(:general_text_no), '0']]), :id => field_id)
+                                                                [l(:general_text_no), '0']]), tag_options)
                    when "list"
                      options = []
                      options << [l(:label_no_change_option), ''] unless custom_field.multiple?
                      options << [l(:label_none), '__none__'] unless custom_field.is_required?
                      options += custom_field.possible_values_options(projects)
-                     select_tag(field_name, options_for_select(options),
-                       :id => field_id, :multiple => custom_field.multiple?)
+                     select_tag(field_name, options_for_select(options), tag_options.merge(:multiple => custom_field.multiple?))
                    else
-                     text_field_tag(field_name, '', :id => field_id)
+                     text_field_tag(field_name, '', tag_options)
                  end
                end

public/stylesheets/application.css +2 0

              em.info {font-style:normal;font-size:90%;color:#888;display:block;}
              em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
+             textarea.text_cf {width:90%;}
              /* Project members tab */
              div#tab-content-members .splitcontentleft, div#tab-content-memberships .splitcontentleft, div#tab-content-users .splitcontentleft { width: 64% }
              div#tab-content-members .splitcontentright, div#tab-content-memberships .splitcontentright, div#tab-content-users .splitcontentright { width: 34% }

test/functional/issues_controller_test.rb +2 -2

                  assert_template 'new'
                  assert_tag 'select',
-                   :attributes => {:name => 'issue[custom_field_values][1]'},
+                   :attributes => {:name => 'issue[custom_field_values][1]', :class => 'list_cf'},
                    :children => {:count => 4},
                    :child => {:tag => 'option', :attributes => {:value => 'MySQL'}, :content => 'MySQL'}
                end
                  assert_template 'bulk_edit'
                  assert_tag :select,
-                   :attributes => {:name => "issue[custom_field_values][#{field.id}]"},
+                   :attributes => {:name => "issue[custom_field_values][#{field.id}]", :class => 'user_cf'},
                    :children => {
                      :only => {:tag => 'option'},
                      :count => Project.find(1).users.count + 2 # "no change" + "none" options

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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