Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19690 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.2.0
@@ -79,7 +79,7 @@ module CustomFieldsHelper | |||
# Return custom field html tag corresponding to its format | |||
def custom_field_tag(prefix, custom_value) | |||
css = "#{custom_value.custom_field.field_format}_cf" | |||
css = custom_value.custom_field.css_classes | |||
data = nil | |||
if custom_value.custom_field.full_text_formatting? | |||
css += ' wiki-edit' | |||
@@ -135,7 +135,7 @@ module CustomFieldsHelper | |||
custom_field, | |||
objects, | |||
value, | |||
:class => "#{custom_field.field_format}_cf") | |||
:class => custom_field.css_classes) | |||
end | |||
# Returns custom field value tag |
@@ -306,7 +306,7 @@ class CustomField < ActiveRecord::Base | |||
end | |||
def css_classes | |||
"cf_#{id}" | |||
"#{field_format}_cf cf_#{id}" | |||
end | |||
protected |
@@ -677,7 +677,7 @@ class ProjectsControllerTest < Redmine::ControllerTest | |||
ProjectCustomField.find_by_name('Development status').update_attribute :visible, true | |||
get(:show, :params => {:id => 'ecookbook'}) | |||
assert_response :success | |||
assert_select 'li[class=?]', 'cf_3', :text => /Development status/ | |||
assert_select 'li.list_cf.cf_3', :text => /Development status/ | |||
end | |||
def test_show_should_not_display_hidden_custom_fields |
@@ -141,7 +141,7 @@ class UsersControllerTest < Redmine::ControllerTest | |||
get :show, :params => {:id => 2} | |||
assert_response :success | |||
assert_select 'li[class=?]', 'cf_4', :text => /Phone number/ | |||
assert_select 'li.cf_4.string_cf', :text => /Phone number/ | |||
end | |||
def test_show_should_not_display_hidden_custom_fields |
@@ -93,7 +93,7 @@ class CustomFieldsHelperTest < Redmine::HelperTest | |||
field = IssueCustomField.create!(:name => 'Long text', :field_format => 'text', :text_formatting => 'full') | |||
value = CustomValue.new(:value => 'bar', :custom_field => field) | |||
assert_select_in custom_field_tag('object', value), 'textarea[class=?]', 'text_cf wiki-edit' | |||
assert_select_in custom_field_tag('object', value), "textarea.text_cf.wiki-edit.cf_#{field.id}" | |||
end | |||
def test_select_type_radio_buttons |