From ea729654cc6e4ba02be57588cb22107db55f0965 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 21 Dec 2008 10:07:50 +0000
Subject: [PATCH] Few fixes and cleaning.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2161 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 nested_projects/app/models/project.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nested_projects/app/models/project.rb b/nested_projects/app/models/project.rb
index 98a796d15..03df4666e 100644
--- a/nested_projects/app/models/project.rb
+++ b/nested_projects/app/models/project.rb
@@ -142,7 +142,7 @@ class Project < ActiveRecord::Base
   
   def project_condition(with_subprojects)
     cond = "#{Project.table_name}.id = #{id}"
-    cond = "(#{cond} OR #{Project.table_name}.parent_id = #{id})" if with_subprojects
+    cond = "(#{cond} OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt}))" if with_subprojects
     cond
   end
   
@@ -229,7 +229,7 @@ class Project < ActiveRecord::Base
     @rolled_up_trackers ||=
       Tracker.find(:all, :include => :projects,
                          :select => "DISTINCT #{Tracker.table_name}.*",
-                         :conditions => ["#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?", id, id],
+                         :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ?", lft, rgt],
                          :order => "#{Tracker.table_name}.position")
   end
   
@@ -300,8 +300,6 @@ class Project < ActiveRecord::Base
 
 protected
   def validate
-    #errors.add(parent_id, " must be a root project") if parent and parent.parent
-    #errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
     errors.add(:identifier, :activerecord_error_invalid) if !identifier.blank? && identifier.match(/^\d*$/)
   end