ransack_ui 0.1.6 → 0.1.7

data/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb

@@ -65,7 +65,7 @@
       else
         predicate_select2.show()
         # If Select2 is on query input, remove and set defaults
-        if query_select2 = @element.find("#s2id_#{base_id}v_0_value")
+        if (query_select2 = @element.find("#s2id_#{base_id}v_0_value")).length > 0
           query_input.select2('destroy')
           query_input.val('')
           previous_val = ''
@@ -181,20 +181,27 @@
           @add_query_input(target, base_name, i + 1, v)
 
     setup_multi_query_input: (predicate_el, query_el, multi_id) ->
-      # Hide query input
-      query_el.hide()
       base_name = predicate_el.attr('name').slice(0, -3) + '[v]'
       query_el.after(
         $('<input class="ransack_query_multi" id="' + multi_id + '" ' +
           'style="width:' + (query_el.width() * 2) + 'px;" ' +
           'data-base-name="' + base_name + '" />'))
 
+      # Fetch all existing values
+      inputs = @element.find("input[name^=\"#{base_name}\"]")
+      values = $.map inputs, (el) ->
+        el.value
+      # Hide all query inputs
+      inputs.hide()
+
       # Find newly created input and setup Select2
-      @element.find('#' + multi_id).select2
+      multi_query = @element.find('#' + multi_id)
+      multi_query.select2
         tags: []
         tokenSeparators: [',']
         formatNoMatches: (t) ->
           "Add a search term"
+      multi_query.select2('val', values)
 
     add_query_input: (base_input, base_name, id, value) ->
       base_input.after $('<input name="'+base_name+'['+id+'][value]" '+
@@ -253,7 +260,7 @@
           allowClear: true
           formatSelection: (object, container) ->
             # Return 'Model: field' unless column is on root model
-            if $(object.element).data('root-model')
+            if !object.element || $(object.element).data('root-model')
               object.text
             else
               group_label = $(object.element).parent().attr('label')
@@ -261,7 +268,7 @@
               if group_label == object.text
                 object.text
               else
-                $(object.element).parent().attr('label') + ': ' + object.text
+                group_label + ': ' + object.text
 
     init_datetimepicker: (base_id) ->
       if $.ui?.timepicker?

data/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb

@@ -16,7 +16,7 @@ module Ransack
         if bases.size > 1
           @template.select(
             @object_name, :name,
-            @template.grouped_options_for_select(attribute_collection_for_bases(bases)),
+            @template.grouped_options_for_select(attribute_collection_for_bases(bases), object.name),
             objectify_options(options), @default_options.merge(html_options)
           )
         else

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_chronic
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4299301087477081386
+      hash: 1445871146542449388
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4299301087477081386
+      hash: 1445871146542449388
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24