Fixed: Unrelated error message when creating a group with an invalid name (#9795).

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

diff --git a/app/models/group.rb b/app/models/group.rb
index 03ca4b3ba337eed71e0c59273031d7f0d1f24edd..fa6b46fff253ba50b4c0873966611a2483a2dc67 100644 (file)
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -51,6 +51,10 @@ class Group < Principal
     end
   end
 
+  def self.human_attribute_name(attribute_key_name, *args)
+    attribute_key_name == 'lastname' ? l(:field_name) : super
+  end
+
   private
 
   # Removes references that are not handled by associations

diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb
index 8ce032dfaa07c03291f7ac547f49cb47523a3b30..2aecc578a12a424d129a324df2ac39de7ca9fe9a 100644 (file)
--- a/test/unit/group_test.rb
+++ b/test/unit/group_test.rb
@@ -33,6 +33,12 @@ class GroupTest < ActiveSupport::TestCase
     assert g.save
   end
 
+  def test_blank_name_error_message
+    g = Group.new
+    assert !g.save
+    assert_include "Name can't be blank", g.errors.full_messages
+  end
+
   def test_roles_given_to_new_user
     group = Group.find(11)
     user = User.find(9)