Optimize issue updates when a version sharing changes.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3135 e93f8b46-1217-0410-a6f0-8f06a7374b81

Optimize issue updates when a version sharing changes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3135 e93f8b46-1217-0410-a6f0-8f06a7374b81
40e2af7a · Jean-Philippe Lang · 517a87f8 · 40e2af7a · 40e2af7a · 40e2af7a
Commit 40e2af7a authored Dec 08, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

issue.rb app/models/issue.rb +2 -2

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

version.rb app/models/version.rb +7 -3

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -344,8 +344,8 @@ class Issue < ActiveRecord::Base
  # fixed_version that is outside of the issue's project hierarchy.
  #
  # OPTIMIZE: does a full table scan of Issues with a fixed_version.
-  def self.update_fixed_versions_from_project_hierarchy_change
-    Issue.all(:conditions => ['fixed_version_id IS NOT NULL'],
+  def self.update_fixed_versions_from_sharing_change(conditions=nil)
+    Issue.all(:conditions => merge_conditions('fixed_version_id IS NOT NULL', conditions),
              :include => [:project, :fixed_version]
              ).each do |issue|
      next if issue.project.nil? || issue.fixed_version.nil?

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -304,7 +304,7 @@ class Project < ActiveRecord::Base
        # move_to_child_of adds the project in last (ie.right) position
        move_to_child_of(p)
      end
-      Issue.update_fixed_versions_from_project_hierarchy_change
+      Issue.update_fixed_versions_from_sharing_change
      true
    else
      # Can not move to the given target

--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -17,7 +17,7 @@

 class Version < ActiveRecord::Base
  before_destroy :check_integrity
-  after_update :update_issue_versions
+  after_update :update_issues_from_sharing_change
  belongs_to :project
  has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
  acts_as_customizable
@@ -161,9 +161,13 @@ private
  end

  # Update the issue's fixed versions. Used if a version's sharing changes.
-  def update_issue_versions
+  def update_issues_from_sharing_change
    if sharing_changed?
-      Issue.update_fixed_versions_from_project_hierarchy_change
+      if VERSION_SHARINGS.index(sharing_was).nil? ||
+          VERSION_SHARINGS.index(sharing).nil? ||
+          VERSION_SHARINGS.index(sharing_was) > VERSION_SHARINGS.index(sharing)
+        Issue.update_fixed_versions_from_sharing_change ['fixed_version_id = ?', id]
+      end
    end
  end