Refactor: move method to model with compatibility wrapper

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

Refactor: move method to model with compatibility wrapper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81
0ca74df6 · Eric Davis · a6f891d1 · 0ca74df6 · 0ca74df6
Commit 0ca74df6 authored Oct 22, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 8 deletions

application_helper.rb app/helpers/application_helper.rb +3 -8

project.rb app/models/project.rb +12 -0

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -238,15 +238,10 @@ module ApplicationHelper
  end
  
  # Yields the given block for each project with its level in the tree
+  #
+  # Wrapper for Project#project_tree
  def project_tree(projects, &block)
-    ancestors = []
-    projects.sort_by(&:lft).each do |project|
-      while (ancestors.any? && !project.is_descendant_of?(ancestors.last)) 
-        ancestors.pop
-      end
-      yield project, ancestors.size
-      ancestors << project
-    end
+    Project.project_tree(projects, &block)
  end
  
  def project_nested_ul(projects, &block)

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -565,6 +565,18 @@ class Project < ActiveRecord::Base
      return nil
    end
  end
+
+  # Yields the given block for each project with its level in the tree
+  def self.project_tree(projects, &block)
+    ancestors = []
+    projects.sort_by(&:lft).each do |project|
+      while (ancestors.any? && !project.is_descendant_of?(ancestors.last)) 
+        ancestors.pop
+      end
+      yield project, ancestors.size
+      ancestors << project
+    end
+  end
  
  private