activeadmin_addons 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e618fad10f9ce658b5c974e0bb3cb659dfecd54d
-  data.tar.gz: abb269e47a0e601ef65763a28ec518f016afca3c
+  metadata.gz: fb0bc25f0bbd9f292d7bb1f157239838880e6301
+  data.tar.gz: ce91eb8f8aafd7a4f032eab9b9070593161cec47
 SHA512:
-  metadata.gz: 14daa20ce5ae1119b4827d42433a1c7d387ef61ed8e487b69bb9cf9a8fd2cc0d5ff8d49bfe302a7bdb093a0bb35a13945de34458b2c8439e06900086b5abf0b8
-  data.tar.gz: 4b09272bae8e79d483e7440e91fcec00f7c966bba06543a34f056569b4203a0f6811acb601cb150aca25d7d526376ae6443d1f9090917ba6ec2909f4784cbef7
+  metadata.gz: c6d569f553ac461d98943bfb89d300202c481e5aa69e3fbd377cfc1a64ad420586eaa910276563c7d47c8f2e517ffa788bd60e78a5399ecb0a1431d02bfe0aa1
+  data.tar.gz: 77bd61606672f16b76770538e0ba702d20467b3013fa28a791e92dd01876cde41c1826509ea996bad8ebab9452ff6b97199bf35ec4a461c52a9d1672ffcf7589

data/app/assets/javascripts/activeadmin_addons/select2.js

@@ -10,12 +10,14 @@ $(function() {
 
   function setupSelect2(container) {
     var INVALID_PARENT_ID = -1;
+    var DEFAULT_SELECT_WIDTH = '80%';
 
     $('.select2-tags', container).each(function(i, el) {
       var model = $(el).data('model'),
           method = $(el).data('method'),
+          width = $(el).data('width'),
           selectOptions = {
-            width: '80%',
+            width: width || DEFAULT_SELECT_WIDTH,
             tags: $(el).data('collection')
           };
 
@@ -29,14 +31,14 @@ $(function() {
       $(el).select2(selectOptions);
 
       function onItemRemoved(event) {
-        var itemId = '#' + prefix +  '_' + event.val;
+        var itemId = '[id=\'' + prefix +  '_' + event.val + '\']';
         $(itemId).remove();
       }
 
       function onItemAdded(event) {
-        var selectedItemsContainer = $('#' + prefix +  '_selected_values'),
-            itemName = model + '[' + method + '][]',
-            itemId = prefix + '_' + event.val;
+        var selectedItemsContainer = $("[id='" + prefix + "_selected_values']"),
+          itemName = model + '[' + method + '][]',
+          itemId = prefix + '_' + event.val;
 
         $('<input>').attr({
           id: itemId,
@@ -48,13 +50,22 @@ $(function() {
     });
 
     $('select:not(.default-select)', container).each(function(i, el) {
+      var firstOption = $('option', el).first(),
+          allowClear  = false;
+
+      if (firstOption.val() === "" && firstOption.text() === "") {
+        allowClear = true;
+      }
+
       if ($(el).closest('.filter_form').length > 0) {
         $(el).select2({
-          width: 'resolve'
+          width: 'resolve',
+          allowClear: allowClear
         });
       } else {
         $(el).select2({
-          width: '80%'
+          width: DEFAULT_SELECT_WIDTH,
+          allowClear: allowClear
         });
       }
     });
@@ -64,6 +75,7 @@ $(function() {
       var fields = $(el).data('fields');
       var displayName = $(el).data('display_name');
       var parent = $(el).data('parent');
+      var width = $(el).data('width') || DEFAULT_SELECT_WIDTH;
       var model = $(el).data('model');
       var responseRoot = $(el).data('response_root');
       var collection = $(el).data('collection');
@@ -131,7 +143,7 @@ $(function() {
       };
 
       var select2Config = {
-        width: '80%',
+        width: width,
         containerCssClass: 'nested-select-container',
         minimumInputLength: minimumInputLength,
         initSelection: function(element, callback) {

data/app/inputs/ajax_filter_input.rb

@@ -0,0 +1,37 @@
+class AjaxFilterInput < Formtastic::Inputs::StringInput
+  include ActiveAdmin::Inputs::Filters::Base
+
+  def to_html
+    input_wrapping do
+      [
+        label_html,
+        builder.text_field(eq_input_name, input_html_options)
+      ].join("\n").html_safe
+    end
+  end
+
+  def eq_input_name
+    "#{method}_eq"
+  end
+
+  # rubocop:disable Metrics/CyclomaticComplexity
+  def input_html_options
+    opts = {}
+    opts[:class] = ['select2-ajax'].concat([@options[:class]] || []).join(' ')
+    opts["data-fields"] = (@options[:fields] || []).to_json
+    opts["data-url"] = @options[:url] || ""
+    opts["data-response_root"] = @options[:response_root] || @options[:url].to_s.split('/').last
+    opts["data-display_name"] = @options[:display_name] || "name"
+    opts["data-minimum_input_length"] = @options[:minimum_input_length] || 1
+    opts["data-width"] = @options[:width] || "100%"
+    opts["data-selected"] = get_selected_value(opts["data-display_name"])
+    super.merge opts
+  end
+
+  # rubocop:disable Style/RescueModifier
+  def get_selected_value(display_name)
+    filter_class = method.to_s.chomp("_id").classify.constantize
+    selected_value = @object.conditions.first.values.first.value rescue nil
+    filter_class.find(selected_value).send(display_name) if !!selected_value
+  end
+end

data/app/inputs/search_select_input.rb

@@ -8,6 +8,7 @@ class SearchSelectInput < Formtastic::Inputs::StringInput
     opts["data-response_root"] = @options[:response_root] || @options[:url].to_s.split('/').last
     opts["data-display_name"] = @options[:display_name] || "name"
     opts["data-minimum_input_length"] = @options[:minimum_input_length] || 1
+    opts["data-width"] = @options[:width] if @options[:width]
     opts["data-selected"] = relation.try(opts["data-display_name"].to_sym)
     super.merge opts
   end

data/app/inputs/tags_input.rb

@@ -2,6 +2,7 @@ class TagsInput < Formtastic::Inputs::StringInput
   def input_html_options
     opts = {}
     opts[:class] = "select2-tags"
+    opts["data-width"] = @options[:width] if @options[:width]
     super.merge(opts)
   end
 

data/lib/activeadmin_addons/addons/paperclip_attachment.rb

@@ -21,24 +21,38 @@ module ActiveAdminAddons
     end
 
     def build_label
-      icon = icon_for_filename(data.original_filename)
+      icon = icon_for_filename(file.original_filename)
       style = { width: "20", height: "20", style: "margin-right: 5px; vertical-align: middle;" }
       icon_img = context.image_tag(icon, style)
-      file_name = data.original_filename
-      file_name = context.truncate(data.original_filename) if options[:truncate] == true
-      label_text = options.fetch(:label, file_name)
+      text = label_text
 
       context.content_tag(:span) do
         context.concat(icon_img)
-        context.safe_concat(label_text)
+        context.safe_concat(text)
       end
     end
 
+    def label_text
+      label =
+        if options[:label].nil?
+          file.original_filename
+        elsif options[:label].is_a? Proc
+          options[:label].call(model).to_s
+        else
+          options[:label].to_s
+        end
+      options[:truncate] ? context.truncate(label) : label
+    end
+
     def render
-      raise 'you need to pass a paperclip attribute' unless data.respond_to?(:url)
+      raise 'you need to pass a paperclip attribute' unless file.respond_to?(:url)
       options[:truncate] = options.fetch(:truncate, true)
-      return nil unless data.exists?
-      context.link_to(build_label, data.url, target: "_blank", class: "attachment-link")
+      return nil unless file.exists?
+      context.link_to(build_label, file.url, target: "_blank", class: "attachment-link")
+    end
+
+    def file
+      model.send(attribute)
     end
   end
 

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "0.9.3"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Platanus
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -375,6 +375,7 @@ files:
 - app/assets/javascripts/palette-color-picker.js
 - app/assets/stylesheets/activeadmin_addons/all.scss
 - app/assets/stylesheets/palette-color-picker.scss
+- app/inputs/ajax_filter_input.rb
 - app/inputs/color_picker_input.rb
 - app/inputs/date_time_picker_input.rb
 - app/inputs/nested_select_input.rb