rails_admin_multiple_file_upload 0.4.0.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b0f55fe64acd8a109ce4495ade21bca8533973f
-  data.tar.gz: 43043dc09af8eddb0ddfd2ba422ef26714227813
+  metadata.gz: 71baa0168d48e55231b5a83d645455aac98fc3b1
+  data.tar.gz: 4623d5dd0f1872fc9eed8a555ac393c7c0d12d81
 SHA512:
-  metadata.gz: dd974244c09297feee5d235d201c0a542a37acecb4471b2eedbb15ebc9add375033c2d9d0b6158914a00910146b7a75fc17afacbfcbd486b11a6a7a01925fa1b
-  data.tar.gz: 5bd857c3b42a6a7660f010ba30b9ed7864da938f92924adaaa41edc17e0634f6c9d5ec4c306fba7561b824c6fb52cb8c30f156ef35381645015c70234321d009
+  metadata.gz: 9065d7d7a1c5ebfca8b07b38f6635792344c20070fe4480d0cbbd59dd90811f22f9c30dd0d02f2fd0b796a15b954d19235fe4a778def714ce661583c92189201
+  data.tar.gz: 08a171131f5d5bc847a46753d3507e3b7b1ad137c5f339b75d455e3406a6b84571b6dcf8e74ab2f3a192943d072ed1544f7ab063e02fd90efec1ce6fc4160f61

data/app/assets/javascripts/rails_admin/rails_admin_multiple_file_upload.coffee

@@ -24,28 +24,39 @@ link_regexp = /^\s*https?:\/\/[^\s]+\s*$/
 
 if window.FileReader
   window.setCopyAndPasteFor = (el)->
-    dropzone = el.getElementsByClassName('dropzone')[0].dropzone
-    el.onpaste = (event) ->
-      items = (event.clipboardData or event.originalEvent.clipboardData).items
-      blob = null
-      i = 0
-      while i < items.length
-        if items[i].type.indexOf('image') == 0
-          blob = items[i].getAsFile()
-
-        else
-          if items[i].kind == "string"
-            items[i].getAsString (text)->
-              if link_regexp.test(text)
-                xhr = new XMLHttpRequest()
-                xhr.open("GET", text)
-                xhr.responseType = "blob"
-                xhr.onload = ()->
-                  _blob = xhr.response
-                  if _blob != null
-                    dropzone.addFile(_blob)
-                xhr.send()
-
-        i++
-      if blob != null
-        dropzone.addFile(blob)
+    unless el.has_clipboard_callback
+      _pasteCallback = (event)->
+        dropzone = $(el).find(".rails_admin_multiple_file_upload_block .dropzone:visible")
+        return if dropzone.length == 0
+        dropzone = dropzone[0].dropzone
+
+        items = (event.clipboardData or event.originalEvent.clipboardData).items
+        blob = null
+        i = 0
+        while i < items.length
+          if items[i].type.indexOf('image') == 0
+            blob = items[i].getAsFile()
+
+          else
+            if items[i].kind == "string"
+              items[i].getAsString (text)->
+                if link_regexp.test(text)
+                  xhr = new XMLHttpRequest()
+                  xhr.open("GET", text)
+                  xhr.responseType = "blob"
+                  xhr.onload = ()->
+                    _blob = xhr.response
+                    if _blob != null
+                      dropzone.addFile(_blob)
+                  xhr.send()
+
+          i++
+        if blob != null
+          dropzone.addFile(blob)
+
+      el.addEventListener 'paste', _pasteCallback
+
+      el.has_clipboard_callback = true
+
+
+  window.setCopyAndPasteFor(document.body)

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

@@ -68,6 +68,5 @@
               e.preventDefault();
               $("##{block_id} .dropzone")[0].dropzone.processQueue();
               return false
-            });
-            
-            setCopyAndPasteFor($("##{block_id}")[0]);
+            });          
+            //setCopyAndPasteFor($("##{block_id}")[0]);

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

@@ -0,0 +1,97 @@
+= stylesheet_link_tag 'rails_admin/rails_admin_multiple_file_upload'
+= javascript_include_tag 'rails_admin/rails_admin_multiple_file_upload'
+
+.rails_admin_multiple_file_upload_block
+  .controls
+    ul.nav.nav-tabs
+      - if multiple_file_upload_fields.blank?
+        ruby:        
+          upload_field      = "image"
+          i18n_path         = "rails_admin.multiple_file_upload_collection.#{@model.name.tableize}.#{upload_field}"
+          i18n_path_default = "rails_admin.multiple_file_upload_collection.#{@model.name.tableize}"
+
+          link = "#multiple_file_upload_collection_#{@model.name.tableize}_#{upload_field}"
+          title = I18n.t(i18n_path, default: I18n.t(i18n_path_default))
+        li
+          = link_to I18n.t(i18n_path, default: I18n.t(i18n_path_default)), link, title: title, "data-toggle" => "tab"
+          
+      - else
+        - multiple_file_upload_fields.each do |f|
+          ruby:
+            upload_field      = f
+
+            i18n_path         = "rails_admin.multiple_file_upload_collection.#{@model.name.tableize}.#{upload_field}"
+            i18n_path_default = "rails_admin.multiple_file_upload_collection.#{@model.name.tableize}"
+
+            link = "#multiple_file_upload_collection_#{@model.name.tableize}_#{upload_field}"
+            title = I18n.t(i18n_path, default: I18n.t(i18n_path_default))
+          li
+            = link_to I18n.t(i18n_path, default: I18n.t(i18n_path_default)), link, title: title, "data-toggle" => "tab"
+
+  .tab-content
+    - if multiple_file_upload_fields.blank?
+      - upload_field = "image"
+      - if @model.respond_to?("sorted")
+        - objects = @model.sorted.to_a
+      - elsif child_objects.respond_to?("ordered")
+        - objects = @model.ordered.to_a
+      -else
+        - objects = @model.all.to_a
+      
+      .tab-pane{id="multiple_file_upload_collection_#{@model.name.tableize}_#{upload_field}"}
+        .row-fluid
+          - block_id  = "rails_admin_multiple_upload_collection_#{@model.name.tableize}_#{upload_field}"
+          - button_id = "rails_admin_multiple_upload_collection_#{@model.name.tableize}_#{upload_field}_button"
+          .span12.rails_admin_multiple_upload_collection{id="#{block_id}"}
+            = rails_admin_multiple_file_upload_collection objects, {upload_field: upload_field}
+            
+          = button_tag "Загрузить", id: button_id
+          javascript:
+            $("##{block_id} .dropzone").dropzone({
+              paramName:        "#{upload_field}",
+              autoProcessQueue: false,
+              addRemoveLinks:   true
+            });
+            $("##{block_id} .dropzone")[0].dropzone.on('success', function(){
+              $("##{button_id}").click();
+            });
+            $("##{button_id}").click(function(e){
+              e.preventDefault();
+              $("##{block_id} .dropzone")[0].dropzone.processQueue();
+              return false
+            });            
+            //setCopyAndPasteFor($("##{block_id}")[0]);
+      
+    - else
+      - multiple_file_upload_fields.each do |f|
+        - upload_field = f      
+        - if @model.respond_to?("sorted")
+          - objects = @model.sorted.to_a
+        - elsif child_objects.respond_to?("ordered")
+          - objects = @model.ordered.to_a
+        -else
+          - objects = @model.all.to_a
+
+        .tab-pane{id="rails_admin_multiple_upload_collection_#{@model.name.tableize}_#{upload_field}"}
+          .row-fluid
+            - block_id  = "rails_admin_multiple_upload_collection_#{@model.name.tableize}_#{upload_field}"
+            - button_id = "rails_admin_multiple_upload_collection_#{@model.name.tableize}_#{upload_field}_button"
+            .span12.rails_admin_multiple_upload{id="#{block_id}"}
+              = rails_admin_multiple_file_upload_collection objects, {upload_field: upload_field}
+              
+            = button_tag "Загрузить", id: button_id
+            javascript:
+              $("##{block_id} .dropzone").dropzone({
+                paramName:        "#{upload_field}",
+                autoProcessQueue: false,
+                addRemoveLinks:   true
+              });
+              $("##{block_id} .dropzone")[0].dropzone.on('success', function(){
+                $("##{button_id}").click();
+              });
+              $("##{button_id}").click(function(e){
+                e.preventDefault();
+                $("##{block_id} .dropzone")[0].dropzone.processQueue();
+                return false
+              });            
+              //setCopyAndPasteFor($("##{block_id}")[0]);

data/config/locales/ru.rails_admin_multiple_file_upload.yml

@@ -8,3 +8,11 @@ ru:
         save_error: "Ошибка при сохранении"
         success:    "Успешно"
         title:      "Загрузка файлов"
+        
+      multiple_file_upload_collection:
+        menu:       "Загрузка файлов"
+        breadcrumb: "Загрузка файлов"
+        error:      "Ошибка"
+        save_error: "Ошибка при сохранении"
+        success:    "Успешно"
+        title:      "Загрузка файлов"

data/lib/rails_admin_multiple_file_upload/action.rb

@@ -42,13 +42,16 @@ module RailsAdmin
 
                   _file = params[child_field][child_model_upload_field]
                   if ["undefined", "blob", '', nil].include?(_file.original_filename)
-                    ext = _file.content_type.split("/").last
-                    _file.original_filename = "#{(Time.new.to_f*1_000_000).to_i}.#{ext}"
+                    ext = ".#{_file.content_type.split("/").last}"
+                    _file.original_filename = "#{(Time.new.to_f*1_000_000).to_i}#{ext}"
+                  else
+                    ext = File.extname(_file.original_filename)
                   end
 
                   main_obj = @object
                   child = main_obj.send(child_field).new
-                  child.send(child_model_upload_field + "=", params[child_field][child_model_upload_field])
+                  child.name = File.basename(_file.original_filename, ext) if @conf.options[:name_from_filename]
+                  child.send(child_model_upload_field + "=", _file)
                   if child.save
                     message = "<strong>#{I18n.t('admin.actions.multiple_file_upload.success')}!</strong>"
                   else
@@ -76,3 +79,81 @@ module RailsAdmin
     end
   end
 end
+
+
+module RailsAdmin
+  module Config
+    module Actions
+      class MultipleFileUploadCollection < Base
+        RailsAdmin::Config::Actions.register(self)
+
+        # Is the action acting on the root level (Example: /admin/contact)
+        register_instance_option :root? do
+          false
+        end
+
+        register_instance_option :collection? do
+          true
+        end
+
+        # Is the action on an object scope (Example: /admin/team/1/edit)
+        register_instance_option :member? do
+          false
+        end
+
+        register_instance_option :route_fragment do
+          'multiple_file_upload_collection'
+        end
+
+        register_instance_option :controller do
+          Proc.new do |klass|
+            @conf = ::RailsAdminMultipleFileUploadCollection::Configuration.new @abstract_model
+            @model = @abstract_model.model
+
+            if request.get?
+              # @nodes = list_entries(@model_config, :index, nil, nil).sort { |a,b| a.lft <=> b.lft }
+              @files = []
+              render action: @action.template_name
+
+            elsif request.post?
+              begin
+                upload_field  = params[:upload_field].to_s
+                upload_field  = "image" if upload_field.blank?
+
+                _file = params[upload_field]
+                if ["undefined", "blob", '', nil].include?(_file.original_filename)
+                  ext = ".#{_file.content_type.split("/").last}"
+                  _file.original_filename = "#{(Time.new.to_f*1_000_000).to_i}#{ext}"
+                else
+                  ext = File.extname(_file.original_filename)
+                end
+
+                @object = @model.new
+                @object.name = File.basename(_file.original_filename, ext) if @conf.options[:name_from_filename]
+                @object.send(upload_field + "=", _file)
+                if @object.save
+                  message = "<strong>#{I18n.t('admin.actions.multiple_file_upload_collection.success')}!</strong>"
+                else
+                  message = "<strong>#{I18n.t('admin.actions.multiple_file_upload_collection.save_error')}</strong>: #{@object.errors.full_messages}"
+                end
+
+              rescue Exception => e
+                message = "<strong>#{I18n.t('admin.actions.multiple_file_upload_collection.error')}</strong>: #{e}"
+              end
+
+              render text: message
+            end
+          end
+        end
+
+        register_instance_option :link_icon do
+          'icon-upload'
+        end
+
+        register_instance_option :http_methods do
+          [:get, :post]
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin_multiple_file_upload/configuration.rb

@@ -9,6 +9,7 @@ module RailsAdminMultipleFileUpload
           fields: [{}],
           thumbnail_size: :thumb,
           upload_gem: :paperclip,
+          name_from_filename: true
       }.merge(config || {})
     end
 
@@ -18,3 +19,25 @@ module RailsAdminMultipleFileUpload
     end
   end
 end
+
+module RailsAdminMultipleFileUploadCollection
+  class Configuration
+    def initialize(abstract_model)
+      @abstract_model = abstract_model
+    end
+
+    def options
+      @options ||= {
+          fields: [],
+          thumbnail_size: :thumb,
+          upload_gem: :paperclip,
+          name_from_filename: true
+      }.merge(config || {})
+    end
+
+    protected
+    def config
+      ::RailsAdmin::Config.model(@abstract_model.model).multiple_file_upload_collection || {}
+    end
+  end
+end

data/lib/rails_admin_multiple_file_upload/helper.rb

@@ -1,7 +1,7 @@
 module RailsAdminMultipleFileUpload
   module Helper
     def rails_admin_multiple_file_upload(files, opts= {})
-      # backward compatibility 
+      # backward compatibility
       opts[:child_field] ||= opts[:embedded_field]
       opts[:child_model_order_field] ||= opts[:embedded_model_order_field]
       opts[:child_model_upload_field] ||= opts[:embedded_model_upload_field]
@@ -28,7 +28,7 @@ module RailsAdminMultipleFileUpload
     def rails_admin_multiple_file_upload_builder(files, config)
       ret = []
       _ret = []
-      @object.send(config[:child_field]).sorted.each do |ef|
+      files.each do |ef|
         if multiple_file_upload_paperclip?
           if ef.send(config[:child_model_upload_field] + "_content_type") =~ /\Aimage/
             file_url = ef.send(config[:child_model_upload_field]).url(multiple_file_upload_thumbnail_size)
@@ -37,9 +37,8 @@ module RailsAdminMultipleFileUpload
           else
             if ef.respond_to?(:name)
               file_name = ef.name
-            else
-              file_name = ef.send(config[:child_model_upload_field] + "_file_name")
             end
+            file_name = ef.send(config[:child_model_upload_field] + "_file_name") if file_name.blank?
             _ret << content_tag(:span, link_to(ef.name), class: "file_block_load_already")
           end
         end
@@ -63,6 +62,57 @@ module RailsAdminMultipleFileUpload
 
 
 
+
+    def rails_admin_multiple_file_upload_collection(files, opts= {})
+
+      id = "ns_#{rand(100_000_000..999_999_999)}"
+      config = {
+          update_url: multiple_file_upload_collection_path(model_name: @abstract_model),
+          upload_field: opts[:upload_field]
+      }
+      content_tag(:div, rails_admin_multiple_file_upload_collection_builder(files, config), id: id, class: 'rails_admin_multiple_file_upload_collection')
+    end
+
+    def rails_admin_multiple_file_upload_collection_builder(files, config)
+      ret = []
+      _ret = []
+      _upload_field = (config[:upload_field].blank? ? "image" : config[:upload_field])
+      files.each do |ef|
+        if multiple_file_upload_paperclip?
+          if ef.send(_upload_field + "_content_type") =~ /\Aimage/
+            file_url = ef.send(_upload_field).url(multiple_file_upload_thumbnail_size)
+            _ret << content_tag(:span, image_tag(file_url), class: "file_block_load_already")
+
+          else
+            if ef.respond_to?(:name)
+              file_name = ef.name
+            end
+            file_name = ef.send(_upload_field + "_file_name") if file_name.blank?
+            _ret << content_tag(:span, link_to(ef.name), class: "file_block_load_already")
+          end
+        end
+      end
+      ret << content_tag(:div, _ret.join.html_safe)
+      ret << content_tag(:div, "", class: "clearfix")
+      @object = @abstract_model.model.new
+      ret << rails_admin_form_for(@object, url: config[:update_url], html: {method: :post, multipart: true, class: "form-horizontal denser dropzone"})do |f|
+        _ret = []
+        _ret << hidden_field_tag(:upload_field, _upload_field)
+        _ret.join.html_safe
+        # f.fields_for config[:child_field] do |ef|
+        #   @object.send(config[:child_field]).each do |field|
+        #     ef.input_for field
+        #   end
+        # end
+        # f.submit
+      end
+      ret.join.html_safe
+    end
+
+
+
+
+
     def multiple_file_upload_fields
       @conf.options[:fields]
     end
@@ -77,5 +127,9 @@ module RailsAdminMultipleFileUpload
       @conf.options[:thumbnail_size]
     end
 
+    def set_name_from_filename?
+      @conf.options[:name_from_filename]
+    end
+
   end
 end

data/lib/rails_admin_multiple_file_upload/model.rb

@@ -4,6 +4,9 @@ module RailsAdmin
       register_instance_option :multiple_file_upload do
         {}
       end
+      register_instance_option :multiple_file_upload_collection do
+        {}
+      end
     end
   end
 end

data/lib/rails_admin_multiple_file_upload/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminMultipleFileUpload
-  VERSION = "0.4.0.1"
+  VERSION = "0.4.1"
 end

data/release.sh

@@ -3,5 +3,4 @@ bundle update
 git add --all .
 git commit -am "${*:1}"
 git push
-git push gh master
-rake release
+rake release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_multiple_file_upload
 version: !ruby/object:Gem::Version
-  version: 0.4.0.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - app/assets/javascripts/rails_admin/rails_admin_multiple_file_upload.coffee
 - app/assets/stylesheets/rails_admin/rails_admin_multiple_file_upload.sass
 - app/views/rails_admin/main/multiple_file_upload.html.slim
+- app/views/rails_admin/main/multiple_file_upload_collection.html.slim
 - config/locales/ru.rails_admin_multiple_file_upload.yml
 - lib/rails_admin_multiple_file_upload.rb
 - lib/rails_admin_multiple_file_upload/action.rb