rails_admin_nestable 0.1.5 → 0.1.6

data/lib/rails_admin_nestable/configuration.rb

@@ -1,8 +1,8 @@
 module RailsAdminNestable
   class Configuration
 
-    TREE_DEFAULT_OPTIONS = { enable_callback: false }
-    LIST_DEFAULT_OPTIONS = { position_field: :position, max_depth: 1, enable_callback: false }
+    TREE_DEFAULT_OPTIONS = { enable_callback: false, scope: nil }
+    LIST_DEFAULT_OPTIONS = { position_field: :position, max_depth: 1, enable_callback: false, scope: nil }
 
     def initialize(abstract_model)
       @abstract_model = abstract_model

data/lib/rails_admin_nestable/nestable.rb

@@ -24,9 +24,10 @@ module RailsAdmin
           Proc.new do |klass|
             @nestable_conf = ::RailsAdminNestable::Configuration.new @abstract_model
 
+            # Methods
             def update_tree(tree_nodes, parent_node = nil)
               tree_nodes.each do |key, value|
-                model = @abstract_model.model.find(value['id'])
+                model = @abstract_model.model.find(value['id'].to_i)
 
                 if parent_node.present?
                   model.parent = parent_node
@@ -48,13 +49,13 @@ module RailsAdmin
 
             def update_list(model_list)
               model_list.each do |key, value|
-                model = @abstract_model.model.find(value['id'])
+                model = @abstract_model.model.find(value['id'].to_i)
                 model.send("#{@nestable_conf.options[:position_field]}=".to_sym, (key.to_i + 1))
                 model.save!(validate: @nestable_conf.options[:enable_callback])
               end
             end
 
-            if params['tree_nodes'].present?
+            if request.post? && params['tree_nodes'].present?
               begin
                 ActiveRecord::Base.transaction do
                   if @nestable_conf.tree?
@@ -71,13 +72,28 @@ module RailsAdmin
               end
 
               render text: message
-            else
+            end
+
+            if request.get?
+              scope = begin
+                case @nestable_conf.options[:scope].class.to_s
+                when 'Proc'
+                  @nestable_conf.options[:scope].call
+                when 'Symbol'
+                  @abstract_model.model.public_send(@nestable_conf.options[:scope])
+                else
+                  nil
+                end
+              end
+
+              query = list_entries(@model_config, :nestable, false, false).reorder(nil).merge(scope)
+
               if @nestable_conf.tree?
-                @tree_nodes = @abstract_model.model.arrange(order: @nestable_conf.options[:position_field])
+                @tree_nodes = query.arrange(order: @nestable_conf.options[:position_field])
               end
 
               if @nestable_conf.list?
-                @tree_nodes = @abstract_model.model.order(@nestable_conf.options[:position_field])
+                @tree_nodes = query.order(@nestable_conf.options[:position_field])
               end
 
               render action: @action.template_name

data/lib/rails_admin_nestable/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminNestable
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_nestable
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrea Dal Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,27 +108,27 @@ files:
 - Rakefile
 - README.md
 homepage: https://github.com/dalpo/rails_admin_nestable
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Reorganise model data with a drag and drop tree/list structure
 test_files: []