ransack_advanced_search 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18acf6ba76b1063a77f370256be06b835f8163b8
-  data.tar.gz: 615e325278e36fac5deb9b8d4979d4fe8838a13c
+  metadata.gz: 9b4430ab2e41dffc747b12024eef7a28aedc09b1
+  data.tar.gz: 281af7a21966b4f0f9303c0f5719f8b34aad12e3
 SHA512:
-  metadata.gz: f49634d2bd23a822b0b1334b2047878ed91a12196e0687b51b025803e35be5331cf5be35de847798fc51bf496b86136e5792b936b9e4339052c7582fc5092944
-  data.tar.gz: f6d3267818bf9da9882ca01635a995af3db2f50a2b17e83f2780aac08c1e1ca5ba0703cb0a0f89240bbd718dff9b9553e39ca1f85d13a4f0d9c8a2ffe349c2c4
+  metadata.gz: d2674f59ca3ef29c7a5ab612aa5dd8e55d5209dfd27b193a45aadfec411c6733e3190ce638ccc497d7f74f235c1747dc138c9995c5358d4e88d860027379a0d5
+  data.tar.gz: 025200200028ca0e9a8f68e20c6f3a2a38d76dec5456bc44e846e84148c6eea6edea8e7e5a95097ea7d44bcf10a1ab144c334517edda9750e25b0e7494ca16ba

data/README.md

@@ -10,7 +10,8 @@ The `ransack_advanced_search` gem provides Bootstrap based templates for the [ra
 * Full [ransack](https://github.com/activerecord-hackery/ransack) compatibility (you can still use the default [ransack](https://github.com/activerecord-hackery/ransack) features);
 * Ransack integrated Advanced Search mode with helpers and views - extracted from [ransack-demo](https://github.com/activerecord-hackery/ransack_demo) project;
 * Saved Searches, scoped by contexts, to persist search params and use it in the future;
-* TODO: custom search value inputs based on data type.
+* Custom search value inputs based on data type;
+* TODO: scope by current user or current account (abstract scope).
 
 ## Installation
 

data/app/assets/stylesheets/ransack_advanced_search/application.css

@@ -12,7 +12,8 @@
  *= require_tree .
  */
 
-.ransack-advanced-search i.remove_fields {
+.ransack-advanced-search i.remove_fields,
+.ransack-advanced-search i.add_fields {
   cursor: pointer;
  }
 
@@ -26,5 +27,5 @@
 }
 
 .ransack-advanced-search .ransack-saved-search-delete {
-    margin: 7px;
+    margin-top: 1px;
 }

data/app/helpers/ransack_advanced_search_helper.rb

@@ -11,7 +11,7 @@ module RansackAdvancedSearchHelper
         fieldName = $(this).find('option:selected')[0].value;
         search.changeValueInputsType(this, fieldName, search);
       });
-      $(document).on("click", "button.add_fields", function() {
+      $(document).on("click", "i.add_fields", function() {
         search.add_fields(this, $(this).data('fieldType'), $(this).data('content'));
         if($(this).hasClass('ransack-add-attribute')) {
           fieldName = $(this).parents('.ransack-condition-field').find('select.ransack-attribute-select').find('option:selected')[0].value;
@@ -47,7 +47,7 @@ module RansackAdvancedSearchHelper
   end
 
   def button_to_remove_fields
-    content_tag :i, nil, class: 'remove_fields glyphicon glyphicon-remove text-danger'
+    content_tag :i, nil, class: 'remove_fields glyphicon glyphicon-minus-sign text-danger'
   end
 
   def button_to_add_fields(name, f, type, custom_class='')
@@ -55,7 +55,7 @@ module RansackAdvancedSearchHelper
     fields = f.send("#{type}_fields", new_object, child_index: "new_#{type}") do |builder|
       render('ransack_advanced_search/' + type.to_s + "_fields", f: builder)
     end
-    content_tag :button, name, :class => custom_class + ' add_fields btn btn-default btn-sm', :type => 'button', 'data-field-type' => type, 'data-content' => "#{fields}"
+    content_tag :i, name, :class => custom_class + ' add_fields glyphicon glyphicon-plus-sign text-success', :type => 'button', 'data-field-type' => type, 'data-content' => "#{fields}"
   end
 
   def button_to_nest_fields(name, type)

data/app/views/ransack_advanced_search/_advanced_search.html.erb

@@ -3,7 +3,7 @@
   <div class="row">
   <% if RansackAdvancedSearch.enable_saved_searches %>
     <div class="col-md-4">
-      <%= render 'ransack_advanced_search/saved_searches_list' %>
+      <%= render 'ransack_advanced_search/saved_searches_list', redirect_path: redirect_path %>
     </div>
     <div class="col-md-8">
   <% else %>
@@ -29,7 +29,7 @@
           <%= f.sort_fields do |s| %>
             <%= render 'ransack_advanced_search/sort_fields', f: s %>
           <% end %>
-          <%= button_to_add_fields t('ransack.advanced_search.sort.add'), f, :sort %>
+          <%= button_to_add_fields '', f, :sort %>
         </div>
 
         <h4><%= t('ransack.advanced_search.condition_group.title') %></h4>
@@ -37,8 +37,7 @@
           <%= f.grouping_fields do |g| %>
             <%= render 'ransack_advanced_search/grouping_fields', f: g %>
           <% end %>
-          <%= button_to_add_fields t('ransack.advanced_search.condition_group.add'),
-              f, :grouping %>
+          <%= button_to_add_fields '', f, :grouping %>
         </div>
 
         <!-- <%= label_tag :distinct, 'Return distinct records?' %> -->
@@ -51,18 +50,6 @@
             <%= f.submit t('ransack.advanced_search.form.save_new_submit_text'), name: 'save_new_search', class: 'btn btn-primary' %>
           <% end %>
           <%= link_to t('ransack.advanced_search.form.clear_search_text'), redirect_path, class: 'btn btn-default' %>
-          <% if RansackAdvancedSearch.enable_saved_searches %>
-            <% if @saved_search.present? && @saved_search.persisted? %>
-              <div class="pull-right ransack-saved-search-delete">
-                <%= link_to saved_search_path(id: @saved_search.id, redirect_to: redirect_path),
-                    { method: :delete, title: t('ransack.advanced_search.form.delete_saved_search'),
-                      data: { confirm: t('ransack.advanced_search.form.delete_saved_search_confirm'),
-                      toggle: 'tooltip', placement: 'bottom' } } do %>
-                  <icon class="glyphicon glyphicon-trash text-danger"></i>
-                <% end %>
-              </div>
-            <% end %>
-          <% end %>
         </div>
       <% end %>
     </div>

data/app/views/ransack_advanced_search/_condition_fields.erb

@@ -2,8 +2,7 @@
   class: 'fields condition ransack-condition-field', 'data-object-name' => f.object_name
   } do %>
 
-  <%= content_tag(:span, button_to_remove_fields,
-    nil, false) %>
+  <%= content_tag(:span, button_to_remove_fields, {}, false) %>
 
   <%= f.attribute_fields do |a| %>
     <%= render 'ransack_advanced_search/attribute_fields', f: a %>
@@ -15,7 +14,6 @@
     <%= render 'ransack_advanced_search/value_fields', f: v %>
   <% end %>
 
-  <%= button_to_add_fields t('ransack.advanced_search.attribute_value.add'),
-      f, :value, 'ransack-add-attribute' %>
+  <%= button_to_add_fields '', f, :value, 'ransack-add-attribute' %>
 
 <% end %>

data/app/views/ransack_advanced_search/_grouping_fields.erb

@@ -1,5 +1,4 @@
-<%= content_tag :div, { class: 'fields',
-  'data-object-name' => f.object_name } do %>
+<%= content_tag :div, { class: 'fields', 'data-object-name' => f.object_name } do %>
 
   <% remove_able = true if local_assigns[:remove_able].nil? %>
   <% if remove_able == false %>
@@ -22,8 +21,7 @@
     <% end %>
   <% end %>
 
-  <%= button_to_add_fields t('ransack.advanced_search.attribute_field.add'),
-      f, :condition %>
+  <%= button_to_add_fields '', f, :condition %>
 
   <%= f.grouping_fields do |g| %>
     <%= render partial: 'ransack_advanced_search/grouping_fields',

data/app/views/ransack_advanced_search/_quick_search.html.erb

@@ -3,14 +3,13 @@
   <div class="row">
   <% if RansackAdvancedSearch.enable_saved_searches %>
     <div class="col-md-4">
-      <%= render 'ransack_advanced_search/saved_searches_list' %>
+      <%= render 'ransack_advanced_search/saved_searches_list', redirect_path: redirect_path %>
     </div>
     <div class="col-md-8">
   <% else %>
     <div class="col-md-12">
   <% end %>
       <%= search_form_for(@search, url: search_url, html: { method: :post, class: 'form-inline', role: 'form'  }) do |f| %>
-
         <% setup_search_form f, @search %>
 
         <% if RansackAdvancedSearch.enable_saved_searches %>
@@ -34,8 +33,7 @@
               <%= render partial: 'ransack_advanced_search/grouping_fields',
                          locals: { f: f, remove_able: true } %>
             <% end %>
-            <%= button_to_add_fields t('ransack.advanced_search.condition_group.add'),
-                f, :grouping %>
+            <%= button_to_add_fields '', f, :grouping %>
           <% end %>
         </div>
 
@@ -47,18 +45,6 @@
             <%= f.submit t('ransack.advanced_search.form.save_new_submit_text'), name: 'save_new_search', class: 'btn btn-primary' %>
           <% end %>
           <%= link_to t('ransack.advanced_search.form.clear_search_text'), redirect_path, class: 'btn btn-default' %>
-          <% if RansackAdvancedSearch.enable_saved_searches %>
-            <% if @saved_search.present? && @saved_search.persisted? %>
-              <div class="pull-right ransack-saved-search-delete">
-                <%= link_to saved_search_path(id: @saved_search.id, redirect_to: redirect_path),
-                    { method: :delete, title: t('ransack.advanced_search.form.delete_saved_search'),
-                      data: { confirm: t('ransack.advanced_search.form.delete_saved_search_confirm'),
-                      toggle: 'tooltip', placement: 'bottom' } } do %>
-                  <icon class="glyphicon glyphicon-trash text-danger"></i>
-                <% end %>
-              </div>
-            <% end %>
-          <% end %>
         </div>
       <% end %>
     </div>

data/app/views/ransack_advanced_search/_saved_searches_list.erb

@@ -1,15 +1,25 @@
 <div class="panel panel-primary">
   <div class="panel-heading"><%= t('ransack.saved_search.title') %></div>
-  <div class="list-group lista-buscas">
+  <ul class="list-group lista-buscas">
     <% @saved_searches.each do |saved_search| %>
-      <%= link_to url_for(saved_search: saved_search.id), method: :post, class: 'list-group-item' do %>
-        <%= saved_search.description %>
-      <% end %>
+      <li class="list-group-item">
+        <%= link_to url_for(saved_search: saved_search.id), method: :post do %>
+          <%= saved_search.description %>
+        <% end %>
+        <div class="pull-right ransack-saved-search-delete">
+          <%= link_to saved_search_path(id: saved_search.id, redirect_to: redirect_path),
+              { method: :delete, title: t('ransack.advanced_search.form.delete_saved_search'),
+                data: { confirm: t('ransack.advanced_search.form.delete_saved_search_confirm'),
+                toggle: 'tooltip', placement: 'bottom' } } do %>
+            <icon class="glyphicon glyphicon-trash text-danger"></i>
+          <% end %>
+        </div>
+      </li>
     <% end %>
     <% if @saved_searches.empty? %>
-      <%= link_to '#', class: 'list-group-item' do %>
+      <li class="list-group-item">
         <em><%= t('ransack.saved_search.empty_list') %></em>
-      <% end %>
+      </li>
     <% end %>
-  </div>
+  </ul>
 </div>

data/app/views/ransack_advanced_search/_sort_fields.erb

@@ -1,3 +1,3 @@
-<%= content_tag(:span,
-  "#{f.sort_select({}, {class: 'form-control input-sm'})} #{button_to_remove_fields}",
+<%= content_tag(:div,
+  "#{button_to_remove_fields} #{f.sort_select({}, {class: 'form-control input-sm'})}",
   { class: 'fields', 'data-object-name' => f.object_name }, false) %>

data/lib/ransack_advanced_search/version.rb

@@ -1,3 +1,3 @@
 module RansackAdvancedSearch
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ransack_advanced_search
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - David Brusius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails