Fixed: Custom values with a nil value cause error on (project|account)/show (#3705).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2894 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Custom values with a nil value cause error on (project|account)/show (#3705).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2894 e93f8b46-1217-0410-a6f0-8f06a7374b81
52a6b0a2 · Jean-Philippe Lang · 41cbd239 · 52a6b0a2 · 52a6b0a2 · 52a6b0a2
Commit 52a6b0a2 authored Sep 20, 2009 by Jean-Philippe Lang
4 changed files
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -10,7 +10,7 @@
 		<li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
 	<% end %>
 	<% for custom_value in @custom_values %>
-	<% if !custom_value.value.empty? %>
+	<% if !custom_value.value.blank? %>
    <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>
 	<% end %>

--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -9,7 +9,7 @@
 	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
  <% end %>
 	<% @project.custom_values.each do |custom_value| %>
-	<% if !custom_value.value.empty? %>
+	<% if !custom_value.value.blank? %>
 	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>
 	<% end %>

--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -37,7 +37,19 @@ class AccountControllerTest < ActionController::TestCase
    assert_template 'show'
    assert_not_nil assigns(:user)
  end
+
+  def test_show_should_not_fail_when_custom_values_are_nil
+    user = User.find(2)
+
+    # Create a custom field to illustrate the issue
+    custom_field = CustomField.create!(:name => 'Testing', :field_format => 'text')
+    custom_value = user.custom_values.build(:custom_field => custom_field).save!
+
+    get :show, :id => 2
+    assert_response :success
+  end
  
+
  def test_show_inactive
    get :show, :id => 5
    assert_response 404

--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb