ransack_ui 0.0.4 → 0.0.5

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

@@ -58,6 +58,7 @@
         query_input.select2
           placeholder: "Search #{selected.data('ajax-entity')}"
           minimumInputLength: 1
+          allowClear: true
           ajax:
             url: selected.data('ajax-url')
             dataType: 'json'
@@ -148,10 +149,14 @@
           placeholder: "Select a Field"
           allowClear: true
           formatSelection: (object, container) ->
-            # Return model name if column is AJAX auto-completed association
-            if $(object.element).data('ajax-url')
+            # Return 'Model: field' if column is not on base model
+            if $(object.element).data('base')
               object.text
-            # Return 'Model: field' if regular column
             else
-              $(object.element).parent().attr('label') + ': ' + object.text
+              group_label = $(object.element).parent().attr('label')
+              # Avoid labels like 'Contact: Contact'
+              if group_label == object.text
+                object.text
+              else
+                $(object.element).parent().attr('label') + ': ' + object.text
 ) jQuery

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

@@ -80,6 +80,8 @@ module Ransack
 
               # Add column type as data attribute
               html_options = {:'data-type' => type}
+              # Set 'base' attribute if attribute is on base model
+              html_options[:'data-base'] = true if base.blank?
 
               if foreign_klass
                 # If field is a foreign key, set up 'data-ajax-*' attributes for auto-complete

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 739364888355864408
+      hash: -11773573269345332
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 739364888355864408
+      hash: -11773573269345332
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24