rails_admin_multiple_file_upload 0.4.2.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 297aca7f3a23683c66a77d3f2573ed060cd73808
-  data.tar.gz: babaa3dc034776b1da95279dc997e8740fd3b99c
+  metadata.gz: a2a765d2be198c84cb26e18b6288a89b731e36f5
+  data.tar.gz: 07987f6026a8d1eea9da12f106f34f6f9fa4544a
 SHA512:
-  metadata.gz: e9e621afb60201f6e8165ddf6cfb6aa93f80bada283e10e6f9355f9b13e7f30fa7e8bcd768a21e9c07da5ce1b938d635831fab6e916a83b16880dd4bb066307c
-  data.tar.gz: 723813b8e39f5d2c8df922760be8e44a1a7fa14ff76b66bc51bfcf3fd5ca5d6473dba7d3a99e5f91351e8c09a36dd53ead0136b802d62b58f0c7c8febac1dc83
+  metadata.gz: f11695f8218aef92861d9526065f764ac9320673aacb9a58424fc3b1776735cfedb146b1c5836b900fc3da0fa00b0586a4c20e303eb7544826a884dd57c11258
+  data.tar.gz: 6990653615e7178bce343ff624fff94671091700ae8fc6a75bde2a70d862cc3e8f8974ce4ad8da71a10636870bb3a6318d97294a2aa7613ece08827a2f0c43c1

data/README.md

@@ -6,7 +6,7 @@ rails_admin + dropzone.js + mongoid(embedded)
 
 Add this line to your application's Gemfile:
 
-    gem 'rails_admin_multiple_file_upload'
+    gem 'rails_admin_multiple_file_upload', '~> 0.4.3'
 
 And then execute:
 

data/app/views/rails_admin/main/multiple_file_upload.html.slim

@@ -59,7 +59,8 @@
             $("##{block_id} .dropzone").dropzone({
               paramName:        "#{child_field}[#{child_model_upload_field}]",
               autoProcessQueue: false,
-              addRemoveLinks:   true
+              addRemoveLinks:   true,
+              parallelUploads: 1
             });
             $("##{block_id} .dropzone")[0].dropzone.on('success', function(){
               $("##{button_id}").click();

data/app/views/rails_admin/main/multiple_file_upload_collection.html.slim

@@ -53,7 +53,8 @@
             $("##{block_id} .dropzone").dropzone({
               paramName:        "#{upload_field}",
               autoProcessQueue: false,
-              addRemoveLinks:   true
+              addRemoveLinks:   true,
+              parallelUploads: 1
             });
             $("##{block_id} .dropzone")[0].dropzone.on('success', function(){
               $("##{button_id}").click();
@@ -88,7 +89,8 @@
               $("##{block_id} .dropzone").dropzone({
                 paramName:        "#{upload_field}",
                 autoProcessQueue: false,
-                addRemoveLinks:   true
+                addRemoveLinks:   true,
+                parallelUploads: 1
               });
               $("##{block_id} .dropzone")[0].dropzone.on('success', function(){
                 $("##{button_id}").click();

data/lib/rails_admin_multiple_file_upload/action.rb

@@ -49,9 +49,25 @@ module RailsAdmin
                   end
 
                   main_obj = @object
-                  child = main_obj.send(child_field).new
+                  child_scope = main_obj.send(child_field)
+                  child = child_scope.new
                   child.name = File.basename(_file.original_filename, ext) if @conf.options[:name_from_filename]
                   child.send(child_model_upload_field + "=", _file)
+                  if @conf.options[:set_order_as_max_plus_one]
+                    begin
+                      if @conf.options[:set_order_as_max_plus_one].is_a?(Symbol) or @conf.options[:set_order_as_max_plus_one].is_a?(String)
+                        f_name = @conf.options[:set_order_as_max_plus_one]
+                      else
+                        f_name = :order
+                      end
+                      if child.respond_to?(f_name) and child.respond_to?("#{f_name}=") and child_scope.respond_to?(f_name)
+                        current_max = child_scope.max(f_name).to_i
+                        child.send("#{f_name}=", current_max + 1)
+                      end
+                    rescue Exception => ex
+                      puts ex.inspect
+                    end
+                  end
                   if child.save
                     message = "<strong>#{I18n.t('admin.actions.multiple_file_upload.success')}!</strong>".freeze
                   else
@@ -62,7 +78,7 @@ module RailsAdmin
                   message = "<strong>#{I18n.t('admin.actions.multiple_file_upload.error')}</strong>: #{e}".freeze
                 end
 
-                render text: message
+                render plain: message
               end
             end
           end
@@ -141,7 +157,7 @@ module RailsAdmin
                 message = "<strong>#{I18n.t('admin.actions.multiple_file_upload_collection.error')}</strong>: #{e}"
               end
 
-              render text: message
+              render plain: message
             end
           end
         end

data/lib/rails_admin_multiple_file_upload/configuration.rb

@@ -9,7 +9,8 @@ module RailsAdminMultipleFileUpload
           fields: [{}],
           thumbnail_size: :thumb,
           upload_gem: :paperclip,
-          name_from_filename: true
+          name_from_filename: true,
+          set_order_as_max_plus_one: true
       }.merge(config || {})
     end
 

data/lib/rails_admin_multiple_file_upload/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminMultipleFileUpload
-  VERSION = "0.4.2.1".freeze
+  VERSION = "0.4.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_multiple_file_upload
 version: !ruby/object:Gem::Version
-  version: 0.4.2.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler