releaf-content 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59bcf2772f44e7e5e81404393789495ad3a78f8
-  data.tar.gz: 27f5c3a33ffff515048a2c6ca4389fbb796c2d7d
+  metadata.gz: d3e39e5e0655124a503e3bd9e89d76053ee5a8ba
+  data.tar.gz: dd26dd7aded3ecf42fd733381471d8711b2e5520
 SHA512:
-  metadata.gz: d5d8e8afbe40691cca83ca6875a55ae0ff52c6223aaba91cff6ce5bbf51a84e122afb9693c5327a3378ea5f5bc8b4448bb4d49bd6bd652a38cdb9f3664b596aa
-  data.tar.gz: fdd72a11447be9d18782e76977e96305282d829ec08bccbe2230f983c4ebd6d2f4cb4af8c081c3bbd67d35b5f7bff93632d1d0080d069548155463647595b7d4
+  metadata.gz: 6f9d9949a7cef5c6eb6acef18b9d276776171e18b9ecf1b5e4ee7a92bc85987fce67cef057ca34266dbe97064ff779c24cc8634a626c614e57c06129602482ee
+  data.tar.gz: 40e49c33905600975e40ad80323697459f693472337e1005959c462c38cb793b16193746ad9603e22c07202fbf994efd1b4d878fb43dbc9db0f9baceb807c94a

data/app/builders/releaf/content/builders/tree.rb

@@ -25,33 +25,22 @@ module Releaf::Content::Builders
     end
 
     def build_tree
-      stack = []
-      result = []
-
-      collection.each do |node|
-        if stack.empty?
-          stack.push({ node: node, children: [] })
-          result << stack.last
-          next
-        end
+      object_hash = collection.inject({}) do |result, node|
+        result[node.id] = { node: node, children: [] }
+        result
+      end
 
-        if stack.last[:node].lft < node.lft && node.lft < stack.last[:node].rgt
-          child = { node: node, children: [] }
-          stack.last[:children] << child
+      object_hash[nil] = { root: true, children: [] }
 
-          if node.rgt + 1 == stack.last[:node].rgt
-            stack.pop
-          end
+      object_hash.each_value do |node|
+        next if node[:root]
+        next if node[:node].parent_id && !object_hash[node[:node].parent_id]
 
-          unless node.leaf?
-            stack.push(child)
-          end
-        else
-          stack.pop
-        end
+        children = object_hash[node[:node].parent_id][:children]
+        children << node
       end
 
-      result
+      object_hash[nil][:children]
     end
 
     def tree

data/app/controllers/releaf/content/nodes_controller.rb

@@ -67,7 +67,7 @@ class Releaf::Content::NodesController < Releaf::ActionController
   protected
 
   def prepare_index
-    @collection = resource_class.reorder(lft: :asc)
+    @collection = resource_class.all
   end
 
   private
@@ -99,7 +99,7 @@ class Releaf::Content::NodesController < Releaf::ActionController
 
   def copy_move_dialog_common
     @resource = resource_class.find params[:id]
-    @collection = resource_class.reorder(lft: :asc)
+    @collection = resource_class.all
   end
 
   def prepare_resource

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-content
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: 1.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: 1.1.14
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement