Merged r17935 from trunk to 4.0-stable (#30985).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17936 e93f8b46-1217-0410-a6f0-8f06a7374b81

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

diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 1f2dd4f32674201ef76ba5d9373a21ab0fff0578..42999ea9eed758c6fa2830b56e5e1d06d106aa2c 100644 (file)
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -118,7 +118,7 @@ class UsersControllerTest < Redmine::ControllerTest
     get :show, :params => {:id => 2}
     assert_response :success
 
-    assert_select 'li', :text => /Phone number/
+    assert_select 'li[class=?]', 'cf_4', :text => /Phone number/
   end
 
   def test_show_should_not_display_hidden_custom_fields