move awesome_nested_set leaf? modification to config/initializers/10-patches.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@12682 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index d186bcdc4b24cb7d1807cf5c5bad97bc5323f99d..0ddbcdd06cbc3787b49195e3dcbeb9895e6654a9 100644 (file)
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -202,3 +202,16 @@ module ActionController
     end
   end
 end
+
+module CollectiveIdea
+  module Acts
+    module NestedSet
+      module Model
+        def leaf_with_new_record?
+          new_record? || leaf_without_new_record?
+        end
+        alias_method_chain :leaf?, :new_record
+      end
+    end
+  end
+end

diff --git a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
index 1a7ceae15d088e6187f9014b5eeeb12be7701498..9832a655b45d1caa8460b0c37a204af2cf41e891 100644 (file)
--- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
+++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
@@ -310,7 +310,7 @@ module CollectiveIdea #:nodoc:
 
         # Returns true if this is the end of a branch.
         def leaf?
-          new_record? || (persisted? && right.to_i - left.to_i == 1)
+          persisted? && right.to_i - left.to_i == 1
         end
 
         # Returns true is this is a child node

diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index 3c611be281140a4f7dbcf9a38672a12138d78028..899344937bf1db3da5ff146fc99a9078a4bfde95 100644 (file)
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -24,6 +24,11 @@ class IssueNestedSetTest < ActiveSupport::TestCase
            :enumerations,
            :issues
 
+  def test_new_record_is_leaf
+    i = Issue.new
+    assert i.leaf?
+  end
+
   def test_create_root_issue
     issue1 = Issue.generate!
     issue2 = Issue.generate!