summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-15 11:13:36 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-12-15 11:13:36 +0000
commit4f5e7d678e5d9d9151c3d0f7daeaa0714272df39 (patch)
treeff3771bc5ae8315c2697cead9551f41577ebf7ed
parent08e309ea46f166a7d6555ddf839f86ec294fb802 (diff)
downloadredmine-4f5e7d678e5d9d9151c3d0f7daeaa0714272df39.tar.gz
redmine-4f5e7d678e5d9d9151c3d0f7daeaa0714272df39.zip
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
-rw-r--r--app/models/group.rb4
-rw-r--r--test/unit/group_test.rb6
2 files changed, 10 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb
index 03ca4b3ba..fa6b46fff 100644
--- 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 8ce032dfa..2aecc578a 100644
--- 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)