From a93fffc36a9fe889545802b64c1bcd3ab558f9ca Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Tue, 1 Apr 2008 22:21:07 +0000
Subject: [PATCH] ActionItem255: changing the categories menu to list all children of the top level items

---
 app/views/shared/categories_menu.rhtml |  2 +-
 lib/acts_as_filesystem.rb              |  8 +++++++-
 test/unit/acts_as_filesystem_test.rb   | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
index f517ad8..fc9bc3d 100644
--- a/app/views/shared/categories_menu.rhtml
+++ b/app/views/shared/categories_menu.rhtml
@@ -4,7 +4,7 @@
     <li id="category<%= item.display_color %>"<%= ' class="active"' if (@category && (@category.top_ancestor == item)) %>>
       <%= item.name %>
       <ul>
-        <% item.children.each do |child| %>
+        <% item.all_children.each do |child| %>
           <% if (params[:controller] == 'search') && (params[:action] == 'assets') %>
             <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'assets', :asset => params[:asset], :category_path => child.explode_path) %></li>
           <% else %>
diff --git a/lib/acts_as_filesystem.rb b/lib/acts_as_filesystem.rb
index a536c77..8febdd3 100644
--- a/lib/acts_as_filesystem.rb
+++ b/lib/acts_as_filesystem.rb
@@ -164,7 +164,7 @@ module ActsAsFileSystem
       while !stack.empty?
         element = stack.pop
         result.push(element)
-        element.children.each do |item|
+        element.children.reverse.each do |item|
           stack.push(item)
         end
       end
@@ -172,6 +172,12 @@ module ActsAsFileSystem
       result.map(&block)
     end
 
+    def all_children
+      res = map_traversal
+      res.shift
+      res
+    end
+
   end
 end
 
diff --git a/test/unit/acts_as_filesystem_test.rb b/test/unit/acts_as_filesystem_test.rb
index aa51829..4b715ea 100644
--- a/test/unit/acts_as_filesystem_test.rb
+++ b/test/unit/acts_as_filesystem_test.rb
@@ -35,6 +35,20 @@ class ActsAsFilesystemTest < Test::Unit::TestCase
     assert_equivalent [a1, a1_1, a1_2, a1_1_1, a1_1_2], a1.map_traversal
   end
 
+  should 'list the full tree without the root' do
+    profile = create_user('testinguser').person
+
+    a1 = profile.articles.build(:name => 'a1'); a1.save!
+
+    a1_1 = profile.articles.build(:name => 'a1.1'); a1_1.parent = a1; a1_1.save!
+    a1_2 = profile.articles.build(:name => 'a1.2'); a1_2.parent = a1; a1_2.save!
+
+    a1_1_1 = profile.articles.build(:name => 'a1.1.1'); a1_1_1.parent = a1_1; a1_1_1.save!
+    a1_1_2 = profile.articles.build(:name => 'a1.1.2'); a1_1_2.parent = a1_1; a1_1_2.save!
+
+    assert_equivalent [a1_1, a1_2, a1_1_1, a1_1_2].map(&:id), a1.all_children.map(&:id)
+  end
+
   should 'be able to traverse with a block' do
     profile = create_user('testinguser').person
 
--
libgit2 0.21.2