noodall-ui 0.4.6 → 0.4.7

data/app/controllers/noodall/admin/nodes_controller.rb

@@ -26,14 +26,6 @@ module Noodall
 
       def tree
         @options = {}
-        @options[:_type] = params[:allowed_types] if params[:allowed_types]
-        if params[:not_branch]
-          @options.merge!(
-            :_id => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])},
-            Node.path_field => {"$ne" => BSON::ObjectId.from_string(params[:not_branch])}
-          )
-        end
-
         respond_to do |format|
           format.html
           format.js

data/app/views/noodall/admin/nodes/_branch.html.erb

@@ -1,10 +1,15 @@
 <ol class="tree">
 <% for node in nodes %>
-  <li><%= link_to h( node.title), node_path(node), :id => "id-#{node.id}" %>
-<% unless (children = node.children.where(options)).empty? -%>
-  <span class="expand">+</span>
-  <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
-<% end -%>
+  <li>
+    <% if params[:allowed_types].include?(node.class.to_s) && node.id != params[:not_branch] && !node.path.include?(params[:not_branch]) %>
+      <%= link_to h(node.title), node_path(node), :id => "id-#{node.id}" %>
+    <% else %>
+      <%= node.title %>
+    <% end %>
+    <% unless (children = node.children.where(options)).empty? -%>
+      <span class="expand">+</span>
+      <%= render :partial => 'branch', :locals => { :nodes => children, :options => options } %>
+    <% end -%>
   </li>
 <% end -%>
 </ol>

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-ui
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noodall-core
-  requirement: &19006040 !ruby/object:Gem::Requirement
+  requirement: &25719160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *19006040
+  version_requirements: *25719160
 - !ruby/object:Gem::Dependency
   name: thoughtbot-sortable_table
-  requirement: &19005540 !ruby/object:Gem::Requirement
+  requirement: &25718680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *19005540
+  version_requirements: *25718680
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &19005060 !ruby/object:Gem::Requirement
+  requirement: &25718200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19005060
+  version_requirements: *25718200
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &19004580 !ruby/object:Gem::Requirement
+  requirement: &25717700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19004580
+  version_requirements: *25717700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19004120 !ruby/object:Gem::Requirement
+  requirement: &25717240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19004120
+  version_requirements: *25717240
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email:
 - steve@wearebeef.co.uk
@@ -656,7 +656,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3390780952771030052
+      hash: 3260966802161771782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: