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

diff --git a/app/models/member.rb b/app/models/member.rb
index 15f2b6c9ace5e576ed125b0cf310dd6231e1a585..f549818678bac5da73c98344332bad19c4358bae 100644 (file)
--- 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 13a00c724eb6bbdf567c3dcf0376a91900e4de8b..d8267158ed20d3fcb316284958eade2d47b47ac5 100644 (file)
--- 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