From c6af5c7982725cd00b10910d14048361b47bb214 Mon Sep 17 00:00:00 2001 From: Robert Mitwicki Date: Mon, 26 Mar 2012 09:14:49 +0200 Subject: [PATCH] Correct error message on group name #873 --- app/models/group.rb | 5 +++++ test/unit/group_test.rb | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/app/models/group.rb b/app/models/group.rb index 7c88a7b1..474557d9 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -48,4 +48,9 @@ class Group < Principal :conditions => ["#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids]).each(&:destroy) end end + + def self.human_attribute_name(attribute_name) + attribute_name = "name" if attribute_name == "lastname" + super(attribute_name) + end end diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index ce672e33..cba828f4 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -16,11 +16,20 @@ require File.expand_path('../../test_helper', __FILE__) class GroupTest < ActiveSupport::TestCase fixtures :all + include Redmine::I18n + def test_create g = Group.new(:lastname => 'New group') assert g.save end + def test_blank_name_error_message + set_language_if_valid 'en' + new_group = Group.new + assert !new_group.valid? + assert new_group.errors.full_messages.include? "Name can't be blank" + end + def test_roles_given_to_new_user group = Group.find(11) user = User.find(9)