Browse Source

Speedup remove_inherited_roles (#22850).

Patch by Pavel Rosický.

git-svn-id: http://svn.redmine.org/redmine/trunk@15883 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
ddf249d7b0

+ 1
- 4
app/models/member_role.rb View File

@@ -72,9 +72,6 @@ class MemberRole < ActiveRecord::Base
end

def remove_inherited_roles
MemberRole.where(:inherited_from => id).group_by(&:member).
each do |member, member_roles|
member_roles.each(&:destroy)
end
MemberRole.where(:inherited_from => id).destroy_all
end
end

+ 1
- 1
app/models/project.rb View File

@@ -844,7 +844,7 @@ class Project < ActiveRecord::Base
end

def remove_inherited_member_roles
member_roles = memberships.map(&:member_roles).flatten
member_roles = MemberRole.where(:member_id => membership_ids).to_a
member_role_ids = member_roles.map(&:id)
member_roles.each do |member_role|
if member_role.inherited_from && !member_role_ids.include?(member_role.inherited_from)

+ 5
- 0
db/migrate/20161002133421_add_index_on_member_roles_inherited_from.rb View File

@@ -0,0 +1,5 @@
class AddIndexOnMemberRolesInheritedFrom < ActiveRecord::Migration
def change
add_index :member_roles, :inherited_from
end
end

Loading…
Cancel
Save