From 15bb2fefa40c536762ac01decef76633ba185ccb Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 8 Dec 2011 13:37:27 +0000 Subject: [PATCH] back out r8124 r8124 shows ":roles can't be empty". git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8125 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/member.rb | 2 +- test/unit/member_test.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/member.rb b/app/models/member.rb index 15f2b6c9a..f54981867 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -84,7 +84,7 @@ class Member < ActiveRecord::Base protected def validate_role - errors.add_on_empty :roles if member_roles.empty? && roles.empty? + errors.add_on_empty :role if member_roles.empty? && roles.empty? end private diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index 13a00c724..d8267158e 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -74,7 +74,6 @@ class MemberTest < ActiveSupport::TestCase assert user.save member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => []) assert !member.save - assert_equal I18n.translate('activerecord.errors.messages.empty'), member.errors[:roles].to_s end def test_validate_member_role -- 2.39.5