diff app/models/group.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/models/group.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/models/group.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -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
 
@@ -66,7 +68,6 @@
       MemberRole.
         includes(:member).
         where("#{Member.table_name}.user_id = ? AND #{MemberRole.table_name}.inherited_from IN (?)", user.id, member.member_role_ids).
-        all.
         each(&:destroy)
     end
   end
@@ -85,6 +86,6 @@
   def remove_references_before_destroy
     return if self.id.nil?
 
-    Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
+    Issue.where(['assigned_to_id = ?', id]).update_all('assigned_to_id = NULL')
   end
 end