##// END OF EJS Templates
jro_apps » redmine
RSS
explicitly define fix has_and_belongs_to_many join_table at Group and User...
Toshi MARUYAMA -
r12196:e9470e55857a
parent child
Show More
Side by Side Unified
Context file:
r12196:e9470e55857a Loading diff...:
Show file before | Show file after | Hide comments
@@ -18,8 +18,10
18 class Group < Principal
18 class Group < Principal
19 include Redmine::SafeAttributes
19 include Redmine::SafeAttributes
20
20
21 has_and_belongs_to_many :users, :after_add => :user_added,
21 has_and_belongs_to_many :users,
22 :after_remove => :user_removed
22 :join_table => "#{table_name_prefix}groups_users#{table_name_suffix}",
23 :after_add => :user_added,
24 :after_remove => :user_removed
23
25
24 acts_as_customizable
26 acts_as_customizable
25
27
Show file before | Show file after | Hide comments
@@ -68,8 +68,10 class User < Principal
68 ['none', :label_user_mail_option_none]
68 ['none', :label_user_mail_option_none]
69 ]
69 ]
70
70
71 has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
71 has_and_belongs_to_many :groups,
72 :after_remove => Proc.new {|user, group| group.user_removed(user)}
72 :join_table => "#{table_name_prefix}groups_users#{table_name_suffix}",
73 :after_add => Proc.new {|user, group| group.user_added(user)},
74 :after_remove => Proc.new {|user, group| group.user_removed(user)}
73 has_many :changesets, :dependent => :nullify
75 has_many :changesets, :dependent => :nullify
74 has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
76 has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
75 has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
77 has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
General Comments 0
You need to be logged in to leave comments. Login now