activeadmin_select_many 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9c0fdce5dcfbe5a11167c48279203992d73efe
-  data.tar.gz: 6f6e07b5c3b117f828cc28ff1ffd216ea99c2598
+  metadata.gz: 3a289f4b6418d0af92538f32caed2af60a8149d6
+  data.tar.gz: 37deed25511b1de438cae523b52a0f4c627d2d4e
 SHA512:
-  metadata.gz: b2e87f285a9d022b4e63239b51e1563db27ae778e55cadd55f0cc4700ed7829bc2948a48bbae39051778cbaedb5f3a37bb9c7b42a54d11c08130a7927d1fbdb7
-  data.tar.gz: ef1b41ed90aba47e1aa8acfd5c2a4e69f94ec98a9d48b76fe799bd2357344d05330ff02a5bb431953bb0782f5901a9677ba734e282e63b2981fa6246ef52c29f
+  metadata.gz: a7774b3c4765e20abf7a18379a86f7faf0482c771fac313320bacb555e4a69c440c765da602c1ead8d93952e68a2acfc98d4ec0d626c22cc53f851f55d2242c9
+  data.tar.gz: f7c76a2763f1a7977ea28e17eafbf1f7dde25a784f715d399f2f7b550f370573dd54161de5326e6e0c21ecd11660e6197f06cf3a90b79080ec4406583e42fc22

data/app/assets/javascripts/activeadmin/select_many.js

@@ -32,6 +32,7 @@ function smUpdateValues( parent ) {
     cnt++;
   });
   if( cnt == 0 ) values.append( $('<input>', { type: 'hidden', name: values.data( 'name' ) }) );
+  parent.find( '.selected span' ).text( ' [' + cnt + ']' );
 }
 
 $(document).ready( function() {
@@ -40,10 +41,13 @@ $(document).ready( function() {
   });
 
   var onLocalSelect = smDebounce( function() {
-    var search = $(this).val().toLowerCase();
+    var cnt = 0, search = $(this).val().toLowerCase();
     $(this).closest( '.select_many' ).find( '[data-select="src"] option' ).each( function() {
-      $(this).toggle( $(this).text().toLowerCase().indexOf( search ) >= 0 );
+      var found = $(this).text().toLowerCase().indexOf( search ) >= 0;
+      $(this).toggle( found );
+      if( found ) cnt++;
     });
+    $(this).parent().find( '.available span' ).text( ' [' + cnt + ']' );
   }, 250 );
   var onRemoteSelect = smDebounce( function() {
     var search = $(this).val().trim();
@@ -53,6 +57,7 @@ $(document).ready( function() {
       var data = {}
       var text_key = $(this).data('text');
       var value_key = $(this).data('value');
+      var counter_limit = $(this).data('counter-limit') ? Number( $(this).data('counter-limit') ) : 0;
       data['q['+$(this).data('search')+']'] = search;
       $.ajax({
         context: _this,
@@ -62,18 +67,21 @@ $(document).ready( function() {
           $(this).data( 'searching', '' );
         },
         success: function( data, status, req ) {
-          // TODO: limit... 100 ?
           var select = $(this).closest( '.select_many' ).find( '[data-select="src"]' );
           select.empty();
           data.forEach( function( item ) {
             select.append( $('<option>', { value: item[value_key], text: item[text_key] }) );
           });
+          $(this).parent().find( '.available span' ).text( ' [' + ( ( counter_limit > 0 && data.length >= counter_limit ) ? ( counter_limit + '+' ) : data.length ) + ']' );
         },
       });
     }
   }, 400 );
 
   $('.select_many.input .search-select').each( function() {
+    var parent = $(this).parent();
+    parent.find( '.available' ).append( '<span> [' + parent.find( '[data-select="src"] option' ).length + ']</span>' );
+    parent.find( '.selected' ).append( '<span> [' + parent.find( '[data-select="dst"] option' ).length + ']</span>' );
     $(this).on( 'keyup', $(this).data( 'remote-collection' ) ? onRemoteSelect : onLocalSelect );
   });
   $('.select_many .add').on( 'click', function() {
@@ -126,7 +134,7 @@ $(document).ready( function() {
           data.forEach( function( item ) {
             sel.append( $('<option>', { value: item[value_key], text: item[text_key] }) );
           });
-          sel.parent().find( '.status' ).text( '[' + data.length + ( counter_limit > 0 && data.length >= counter_limit ? '+' : '' ) + ']' );
+          sel.parent().find( '.status' ).text( '[' + ( ( counter_limit > 0 && data.length >= counter_limit ) ? ( counter_limit + '+' ) : data.length ) + ']' );
         },
       });
     }

data/lib/activeadmin/select_many/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SelectMany
-    VERSION = '0.2.6'
+    VERSION = '0.2.8'
   end
 end

data/lib/formtastic/inputs/select_many_input.rb

@@ -40,7 +40,7 @@ module Formtastic
       end
 
       def search_box_html
-        @opts ||= {id: nil, class: 'search-select', placeholder: options.delete( :placeholder ), 'data-remote-collection': options[:'data-remote-collection'], 'data-search': options[:search_param] ? options[:search_param] : 'name_contains', 'data-text': options[:member_label] ? options[:member_label] : ( options[:text_key] ? options[:text_key] : 'name' ), 'data-value': options[:value_key] ? options[:value_key] : 'id'}
+        @opts ||= {id: nil, class: 'search-select', placeholder: options.delete( :placeholder ), 'data-remote-collection': options[:'data-remote-collection'], 'data-search': options[:search_param] ? options[:search_param] : 'name_contains', 'data-text': options[:member_label] ? options[:member_label] : ( options[:text_key] ? options[:text_key] : 'name' ), 'data-value': options[:value_key] ? options[:value_key] : 'id', 'data-counter-limit': options[:counter_limit].to_i}
         template.text_field_tag( nil, '', @opts )
       end
 

data/lib/formtastic/inputs/select_one_input.rb

@@ -26,7 +26,7 @@ module Formtastic
 
       def search_box
         # TODO: remove text_key in next major version
-        @opts ||= {id: nil, class: 'search-select', placeholder: options[:placeholder], 'data-remote-collection': options[:remote_collection], 'data-search': options[:search_param] ? options[:search_param] : 'name_contains', 'data-text': options[:member_label] ? options[:member_label] : ( options[:text_key] ? options[:text_key] : 'name' ), 'data-value': options[:value_key] ? options[:value_key] : 'id', 'data-msg': options[:msg_items], 'data-counter-limit': options[:counter_limit].to_i }
+        @opts ||= {id: nil, class: 'search-select', placeholder: options[:placeholder], 'data-remote-collection': options[:remote_collection], 'data-search': options[:search_param] ? options[:search_param] : 'name_contains', 'data-text': options[:member_label] ? options[:member_label] : ( options[:text_key] ? options[:text_key] : 'name' ), 'data-value': options[:value_key] ? options[:value_key] : 'id', 'data-msg': options[:msg_items], 'data-counter-limit': options[:counter_limit].to_i}
         template.text_field_tag( nil, '', @opts )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_select_many
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin