activeadmin_addons 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 262c6935a014a6a9cf1d0ffc946fcfdecc15d875
-  data.tar.gz: 26cf0c452aac19ecf87b9519dec88e17097476f0
+  metadata.gz: 91d4876ea2cb7334f8c2dbc40fb17e5823478982
+  data.tar.gz: cde3168fdf880d9a82405bbd390387bb51bbfff4
 SHA512:
-  metadata.gz: cd2f61ef49875b490e0350558a51dfc237dd1d733c631e5b654282f546ecb9a5d91a7a8dee37588f9150810552a5a617c9b7cae0eb0ac48bd850cb5c4dbc2f7a
-  data.tar.gz: 9eeca7a307ab62d44f32834937473cbb3b4068ef53bc8cce7bcc04d2df4cbc4d0854910dc650b84c14fbe655437514226e8437bb3d8f2ef1ebe74e60942de51b
+  metadata.gz: bbedf34cd625f6c3379730abd2b1b9055b044080fc4c5d6b77499a02f1c61a49441c1d82c834de2971caa554df7908fcf0c55bca452ac28aa43583500131af60
+  data.tar.gz: e27cbfb2b0272abe956a1f4fed8520a5e8ee898ec838d7837ad98af96d75f35bd76789377e484a4a700984114fa47ed52a829a3f7cac8526d589c1ab4ebc5ace

data/app/assets/javascripts/activeadmin_addons/all.js.coffee

@@ -1,3 +1,4 @@
+#= require ./config
 #= require ./select2
 #= require ./date-time-picker
 #= require ./color-picker

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

@@ -0,0 +1,7 @@
+$(function() {
+  ActiveadminAddons = {
+    config: {
+      defaultSelect: $('body').data('default-select')
+    }
+  }
+});

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

@@ -2,182 +2,208 @@
 //= require_self
 
 $(function() {
-  setupSelect2(document);
+  configureSelect2(document);
 
   $(document).on('has_many_add:after', function(event, container){
-    setupSelect2(container);
+    configureSelect2(container);
   });
 
-  function setupSelect2(container) {
+  function configureSelect2(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: width || DEFAULT_SELECT_WIDTH,
-            tags: $(el).data('collection')
-          };
-
-      if(!!model) {
-        selectOptions.createSearchChoice = function() { return null; };
-        var prefix = model + '_' + method;
-        $(el).on('select2-selecting', onItemAdded);
-        $(el).on('select2-removed', onItemRemoved);
-      }
+    setupDefaultBehaviour();
+    setupAjaxSearch();
+    setupTags();
+
+    function setupTags() {
+      $('.select2-tags', container).each(function(i, el) {
+        var model = $(el).data('model'),
+            method = $(el).data('method'),
+            width = $(el).data('width'),
+            selectOptions = {
+              width: width || DEFAULT_SELECT_WIDTH,
+              tags: $(el).data('collection')
+            };
+
+        if(!!model) {
+          selectOptions.createSearchChoice = function() { return null; };
+          var prefix = model + '_' + method;
+          $(el).on('select2-selecting', onItemAdded);
+          $(el).on('select2-removed', onItemRemoved);
+        }
 
-      $(el).select2(selectOptions);
+        $(el).select2(selectOptions);
 
-      function onItemRemoved(event) {
-        var itemId = '[id=\'' + prefix +  '_' + event.val + '\']';
-        $(itemId).remove();
-      }
+        function onItemRemoved(event) {
+          var itemId = '[id=\'' + prefix +  '_' + event.val + '\']';
+          $(itemId).remove();
+        }
 
-      function onItemAdded(event) {
-        var selectedItemsContainer = $("[id='" + prefix + "_selected_values']"),
-          itemName = model + '[' + method + '][]',
-          itemId = prefix + '_' + event.val;
-
-        $('<input>').attr({
-          id: itemId,
-          name: itemName,
-          type: 'hidden',
-          value: event.val
-        }).appendTo(selectedItemsContainer);
-      }
-    });
+        function onItemAdded(event) {
+          var selectedItemsContainer = $("[id='" + prefix + "_selected_values']"),
+            itemName = model + '[' + method + '][]',
+            itemId = prefix + '_' + event.val;
+
+          $('<input>').attr({
+            id: itemId,
+            name: itemName,
+            type: 'hidden',
+            value: event.val
+          }).appendTo(selectedItemsContainer);
+        }
+      });
+    }
+
+    function setupAjaxSearch() {
+      $('.select2-ajax', container).each(function(i, el) {
+        var url = $(el).data('url');
+        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');
+        var minimumInputLength = $(el).data('minimum_input_length');
+        var order = $(el).data('order') || (fields[0] + '_desc');
+        var parentId = $(el).data('parent_id') || INVALID_PARENT_ID;
+        var selectInstance;
+
+        var ajaxOptions = {
+          url: url,
+          dataType: 'json',
+          delay: 250,
+          data: function(term) {
+            var textQuery = { m: 'or' };
+            fields.forEach(function(field) {
+              if (field == "id") {
+                textQuery[field + '_eq'] = term;
+              } else {
+                textQuery[field + '_contains'] = term;
+              }
+            });
+
+            var query =  {
+              order: order,
+              q: {
+                groupings: [textQuery],
+                combinator: 'and'
+              }
+            };
+
+            if (!!parent) {
+              query.q[parent + '_eq'] = parentId;
+            }
+
+            return query;
+          },
+          results: function(data, page) {
+            if(data.constructor == Object) {
+              data = data[responseRoot];
+            }
 
-    $('select:not(.default-select)', container).each(function(i, el) {
-      var firstOption = $('option', el).first(),
+            return {
+              results: jQuery.map(data, function(resource) {
+                return {
+                  id: resource.id,
+                  text: resource[displayName].toString()
+                };
+              })
+            };
+          },
+          cache: true
+        };
+
+        var collectionOptions = function(query) {
+          var data = { results: [] };
+
+          collection.forEach(function(record) {
+            var matched = fields.some(function(field) {
+              var regex = new RegExp(query.term, 'i');
+              return !!record[field] && !!record[field].match(regex);
+            });
+
+            if((!parent || record[parent] == parentId) && matched) {
+              data.results.push({ id: record.id, text: record[displayName].toString() });
+            }
+          });
+
+          query.callback(data);
+        };
+
+        var select2Config = {
+          width: width,
+          containerCssClass: 'nested-select-container',
+          minimumInputLength: minimumInputLength,
+          initSelection: function(element, callback) {
+            var id = $(element).val();
+            var text = $(element).data('selected') || '';
+            $(element).data('selected', '');
+
+            callback({
+              id: id,
+              text: text
+            });
+          },
+          placeholder: ' ',
+          allowClear: true
+        };
+
+        if (!!parent) {
+          var parentSelector = '#' + model + '_' + parent;
+
+          $(el).parent().find(parentSelector).on('change', function(e) {
+            selectInstance.val(null).trigger('change');
+            parentId = e.val;
+
+            if(!parentId) {
+              parentId = INVALID_PARENT_ID;
+            }
+          });
+        }
+
+        if (collection) {
+          select2Config.query = collectionOptions;
+        } else {
+          select2Config.ajax = ajaxOptions;
+        }
+
+        selectInstance = $(el).select2(select2Config);
+      });
+    }
+
+    function setupSelect2(select) {
+      var firstOption = $('option', select).first(),
           allowClear  = false;
 
       if (firstOption.val() === "" && firstOption.text() === "") {
         allowClear = true;
       }
 
-      if ($(el).closest('.filter_form').length > 0) {
-        $(el).select2({
+      if ($(select).closest('.filter_form').length > 0) {
+        $(select).select2({
           width: 'resolve',
           allowClear: allowClear
         });
       } else {
-        $(el).select2({
+        $(select).select2({
           width: DEFAULT_SELECT_WIDTH,
           allowClear: allowClear
         });
       }
-    });
-
-    $('.select2-ajax', container).each(function(i, el) {
-      var url = $(el).data('url');
-      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');
-      var minimumInputLength = $(el).data('minimum_input_length');
-      var order = fields[0] + '_desc';
-      var parentId = $(el).data('parent_id') || INVALID_PARENT_ID;
-      var selectInstance;
-
-      var ajaxOptions = {
-        url: url,
-        dataType: 'json',
-        delay: 250,
-        data: function(term) {
-          var textQuery = { m: 'or' };
-          fields.forEach(function(field) {
-            textQuery[field + '_contains'] = term;
-          });
-
-          var query =  {
-            order: order,
-            q: {
-              groupings: [textQuery],
-              combinator: 'and'
-            }
-          };
-
-          if (!!parent) {
-            query.q[parent + '_eq'] = parentId;
-          }
-
-          return query;
-        },
-        results: function(data, page) {
-          if(data.constructor == Object) {
-            data = data[responseRoot];
-          }
-
-          return {
-            results: jQuery.map(data, function(resource) {
-              return {
-                id: resource.id,
-                text: resource[displayName].toString()
-              };
-            })
-          };
-        },
-        cache: true
-      };
-
-      var collectionOptions = function(query) {
-        var data = { results: [] };
-
-        collection.forEach(function(record) {
-          var matched = fields.some(function(field) {
-            var regex = new RegExp(query.term, 'i');
-            return !!record[field] && !!record[field].match(regex);
-          });
-
-          if((!parent || record[parent] == parentId) && matched) {
-            data.results.push({ id: record.id, text: record[displayName].toString() });
-          }
-        });
+    }
 
-        query.callback(data);
-      };
-
-      var select2Config = {
-        width: width,
-        containerCssClass: 'nested-select-container',
-        minimumInputLength: minimumInputLength,
-        initSelection: function(element, callback) {
-          var id = $(element).val();
-          var text = $(element).data('selected') || '';
-          $(element).data('selected', '');
-
-          callback({
-            id: id,
-            text: text
-          });
-        }
-      };
-
-      if (!!parent) {
-        var parentSelector = '#' + model + '_' + parent;
-
-        $(el).parent().find(parentSelector).on('change', function(e) {
-          selectInstance.val(null).trigger('change');
-          parentId = e.val;
-
-          if(!parentId) {
-            parentId = INVALID_PARENT_ID;
-          }
+    function setupDefaultBehaviour() {
+      if(ActiveadminAddons.config.defaultSelect == 'select2') {
+        $('select:not(.default-select)', container).each(function(i, el) {
+          setupSelect2(el);
         });
       }
 
-      if (collection) {
-        select2Config.query = collectionOptions;
-      } else {
-        select2Config.ajax = ajaxOptions;
-      }
-
-      selectInstance = $(el).select2(select2Config);
-    });
+      $('select.select2', container).each(function(i, el) {
+        setupSelect2(el);
+      });
+    }
   }
 });

data/app/inputs/ajax_filter_input.rb

@@ -19,19 +19,28 @@ class AjaxFilterInput < Formtastic::Inputs::StringInput
     opts = {}
     opts[:class] = ['select2-ajax'].concat([@options[:class]] || []).join(' ')
     opts["data-fields"] = (@options[:fields] || []).to_json
-    opts["data-url"] = @options[:url] || ""
+    opts["data-url"] = 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"])
+    opts["data-order"] = @options[:order_by] if @options[:order_by]
     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 = method.to_s.chomp("_id").classify.constantize rescue @object.klass
+    selected_value = @object.conditions.find { |c| c.attributes.map(&:name).include?(method.to_s) }.values.first.value rescue nil
     filter_class.find(selected_value).send(display_name) if !!selected_value
   end
+
+  def url
+    if @options[:url].is_a?(Proc)
+      template.instance_eval(&@options[:url]) || ""
+    else
+      @options[:url] || ""
+    end
+  end
 end

data/app/inputs/date_time_picker_input.rb

@@ -40,7 +40,11 @@ class DateTimePickerInput < Formtastic::Inputs::StringInput
   end
 
   def input_value(input_name = nil)
-    v = object.public_send(input_name || method)
+    if options[:input_html] && options[:input_html].key?(:value)
+      return options[:input_html][:value]
+    end
+
+    v = !object.nil? ? object.public_send(input_name || method) : ''
 
     if v.is_a?(Time)
       return DateTime.new(v.year, v.month, v.day, v.hour, v.min, v.sec).strftime(format)

data/app/inputs/search_select_input.rb

@@ -1,6 +1,6 @@
 class SearchSelectInput < Formtastic::Inputs::StringInput
   def input_html_options
-    relation = @object.send(attributized_method_name)
+    relation = !@object.nil? ? @object.send(attributized_method_name) : ''
     opts = {}
     opts[:class] = ['select2-ajax'].concat([@options[:class]] || []).join(' ')
     opts["data-fields"] = (@options[:fields] || []).to_json
@@ -10,6 +10,7 @@ class SearchSelectInput < Formtastic::Inputs::StringInput
     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)
+    opts["data-order"] = @options[:order_by] if @options[:order_by]
     super.merge opts
   end
 end

data/app/inputs/tags_input.rb

@@ -52,7 +52,10 @@ class TagsInput < Formtastic::Inputs::StringInput
     end
 
     opts["data-collection"] = @options[:collection].map do |item|
-      { id: item.id, text: item.send((@options[:display_name] || "name")) }
+      {
+        id: item.send((@options[:value] || "id")),
+        text: item.send((@options[:display_name] || "name"))
+      }
     end.to_json
 
     opts
@@ -79,6 +82,6 @@ class TagsInput < Formtastic::Inputs::StringInput
   end
 
   def model_name
-    @object.class.to_s.underscore
+    @object.class.to_s.underscore.tr('/', '_')
   end
 end

data/lib/activeadmin_addons.rb

@@ -1,4 +1,17 @@
 module ActiveadminAddons
+  extend self
+
+  attr_writer :default_select
+
+  def default_select
+    return "select2" unless @default_select
+    @default_select
+  end
+
+  def setup
+    yield self
+    require "activeadmin_addons"
+  end
 end
 
 require_relative './activeadmin_addons/engine'

data/lib/activeadmin_addons/active_admin_config.rb

@@ -0,0 +1,8 @@
+class ActiveAdmin::Views::Pages::Base
+  alias_method :original_add_classes_to_body, :add_classes_to_body
+
+  def add_classes_to_body
+    original_add_classes_to_body
+    @body.set_attribute "data-default-select", ActiveadminAddons.default_select
+  end
+end

data/lib/activeadmin_addons/engine.rb

@@ -15,6 +15,7 @@ module ActiveAdminAddons
         require_relative './addons/list'
         require_relative './support/enumerize_formtastic_support'
         require_relative './support/set_datepicker'
+        require_relative 'active_admin_config'
         app.config.assets.precompile += %w(select.scss fileicons/*.png)
       end
     end

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/lib/generators/activeadmin_addons/install/install_generator.rb

@@ -1,6 +1,12 @@
 module ActiveadminAddons
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      def create_initializer
+        template "initializer.rb", "config/initializers/activeadmin_addons.rb"
+      end
+
       def add_javascripts
         file_path = 'app/assets/javascripts/active_admin.js.coffee'
         line_to_add = "#= require activeadmin_addons/all\n"

data/lib/generators/activeadmin_addons/install/templates/initializer.rb

@@ -0,0 +1,4 @@
+ActiveadminAddons.setup do |config|
+  # Change to "default" if you want to use ActiveAdmin's default select control.
+  # config.default_select = "select2"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Platanus
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -370,6 +370,7 @@ files:
 - app/assets/images/fileicons/file_extension_zip.png
 - app/assets/javascripts/activeadmin_addons/all.js.coffee
 - app/assets/javascripts/activeadmin_addons/color-picker.js
+- app/assets/javascripts/activeadmin_addons/config.js
 - app/assets/javascripts/activeadmin_addons/date-time-picker.js
 - app/assets/javascripts/activeadmin_addons/select2.js
 - app/assets/javascripts/palette-color-picker.js
@@ -383,6 +384,7 @@ files:
 - app/inputs/search_select_input.rb
 - app/inputs/tags_input.rb
 - lib/activeadmin_addons.rb
+- lib/activeadmin_addons/active_admin_config.rb
 - lib/activeadmin_addons/addons/bool_values.rb
 - lib/activeadmin_addons/addons/enum_tag.rb
 - lib/activeadmin_addons/addons/list.rb
@@ -396,6 +398,7 @@ files:
 - lib/activeadmin_addons/support/set_datepicker.rb
 - lib/activeadmin_addons/version.rb
 - lib/generators/activeadmin_addons/install/install_generator.rb
+- lib/generators/activeadmin_addons/install/templates/initializer.rb
 - lib/tasks/activeadmin_addons_tasks.rake
 homepage: https://github.com/platanus/activeadmin_addons
 licenses:
@@ -417,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Set of addons to help with the activeadmin ui