Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-26 14:20:52 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17936 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-03-09 15:22:30 +00:00
parent 5a1b03eeaf
commit 24af62b16c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/show.html.erb
View File

@@ -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>

2
test/functional/users_controller_test.rb
View File

@@ -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