rails_admin_multiple_file_upload 0.5.0.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ea913f8cfb693e6eb6ce4fbc4ae5aa7f811027
-  data.tar.gz: b8ef6b8154e654de2ee5b90216733f329282ba22
+  metadata.gz: ca6dcc705629abcc17e40a1903635a6d61e05e23
+  data.tar.gz: bb7323449dd41a1040e1c717808871add957d16f
 SHA512:
-  metadata.gz: ade0f3d65df254d58c35fc131e043628e23c586d98a03c2ab4d05616519cc2e99a634afaf11ab7de15d17d2b6ffbf20a5c059e5ed362915b9691f8f7d5346840
-  data.tar.gz: dde4fc1f14b7988fa08070121fef63fddfc8518ddf8e5a4178dfc635a00e9bf265e5b586cf6f1da04a362bdf90815622c9046719c4c132bb15e0552de84ba988
+  metadata.gz: f381311096003b013ca388fe61342bb55ee152f6e253b667d1d894c1ee46cfe1b662a823421b975271a03c673850c3b132a50ff93b7e868f36da38c684db9b4e
+  data.tar.gz: 8c585fe2c20098a53dd8263d1293af2de64af142349d2cee70fc75e0f9a8c4a5466c34b9dfc74221c0d4a42c0059c6b4ccad3a8dbad227eddf2329b37512e4ef

data/README.md

@@ -8,7 +8,7 @@ rails_admin + dropzone.js + mongoid(embedded)
 
 Add this line to your application's Gemfile:
 
-    gem 'rails_admin_multiple_file_upload', '~> 0.5.0'
+    gem 'rails_admin_multiple_file_upload', '~> 0.5.1'
 
 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.5.0.1".freeze
+  VERSION = "0.5.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_multiple_file_upload
 version: !ruby/object:Gem::Version
-  version: 0.5.0.1
+  version: 0.5.1
 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