explicitly define fix has_and_belongs_to_many join_table at Group and User

Rails4 cannot resolve automatically.

git-svn-id: http://svn.redmine.org/redmine/trunk@12471 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/group.rb b/app/models/group.rb
index d1b2cb966ad0a65e816afd51289b403b5168af9c..3e4bdf09a790dab1e02b313258285de12a39e74a 100644 (file)
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -18,8 +18,10 @@
 class Group < Principal
   include Redmine::SafeAttributes
 
-  has_and_belongs_to_many :users, :after_add => :user_added,
-                                  :after_remove => :user_removed
+  has_and_belongs_to_many :users,
+                          :join_table   => "#{table_name_prefix}groups_users#{table_name_suffix}",
+                          :after_add => :user_added,
+                          :after_remove => :user_removed
 
   acts_as_customizable
 

diff --git a/app/models/user.rb b/app/models/user.rb
index 9020295d047a6a56a243ffd886a5af93e52bff41..74528aa6d44512b4288c080ba298b5bfb713829f 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,8 +68,10 @@ class User < Principal
     ['none', :label_user_mail_option_none]
   ]
 
-  has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
-                                   :after_remove => Proc.new {|user, group| group.user_removed(user)}
+  has_and_belongs_to_many :groups,
+                          :join_table   => "#{table_name_prefix}groups_users#{table_name_suffix}",
+                          :after_add    => Proc.new {|user, group| group.user_added(user)},
+                          :after_remove => Proc.new {|user, group| group.user_removed(user)}
   has_many :changesets, :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
   has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"