adminsite 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3d294a019111f15b80a047d93e7150220447b1
-  data.tar.gz: 95b04287bc58eb4fad54eb2f4089da3c64faed6f
+  metadata.gz: 19d396b76029c39ad67a1f2d2ef6257eaad32cf6
+  data.tar.gz: f3fb9c4f7ef39c13d17caf8550c8d98890da3d69
 SHA512:
-  metadata.gz: 1756e777130a3f963ebf05ee01a24e4d5d269ba01560584ffd1d97573185471d94e3600718936b00013bb3e8ccb91c9fc2a9d9102b60ba30e48126bc1ce7a78f
-  data.tar.gz: f3a2157f68c0be9af4d100d5fa83a6a2f047aa552d6bda05e6528a2324f55a54d663263c98d5e89809c36e2a7d99c76d972fd7ff1b88ef4891287757ba4dbeb9
+  metadata.gz: c9918c79e62f8c32bbaf4a7d8ae51049180ac3812e04a3adc7e0d13c315d540e0d1b934f7343dc226402b6b06baf04a943fdd3a6cde5103ee3a760082df4b421
+  data.tar.gz: 3027a002d44c0e842ba0c1792046054078925536316564a1539a82eacc02aa38282759a4878dee8e55675f9405c8763c0ca09648f088d59fc521cf4d82cdc901

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (2.1.1)
+    adminsite (2.1.2)
       actionpack-page_caching
       codemirror-rails (>= 4.8)
       devise (~> 3.4)

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -50,6 +50,7 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
     @q = resources.order(order_params).ransack(params[:q])
     @resources = @q.result.page(params[:page])
     @ransack_params = ransack_params
+    @show_search_form = @ransack_params[:q].try(:except, :s).present?
     render :json => @resources if api_call?
   end
 

data/app/views/adminsite/admin/resources/_search_form.html.haml

@@ -1,9 +1,8 @@
 - if resource_admin_config.attributes_search.any?
   .search_form
-    - show_search_form = @ransack_params[:q].present?
-    %a#show{onClick: 'Adminsite.showSearchForm();', style: "#{'display:none' if show_search_form}"  } Show Filters
-    %a#hide{onClick: 'Adminsite.hideSearchForm();', style: "#{'display:none' unless show_search_form}" } Hide Filters
-    = search_form_for(@q, :url => admin_resource_path(nil), method: :get, html: { style: "#{'display:none' unless show_search_form}"} ) do |f|
+    %a#show{onClick: 'Adminsite.showSearchForm();', style: "#{'display:none' if @show_search_form}"  } Show Filters
+    %a#hide{onClick: 'Adminsite.hideSearchForm();', style: "#{'display:none' unless @show_search_form}" } Hide Filters
+    = search_form_for(@q, :url => admin_resource_path(nil), method: :get, html: { style: "#{'display:none' unless @show_search_form}"} ) do |f|
       = hidden_field_tag :admin_menu, params[:admin_menu]
       %div{id: "#{controller_name}-search"}
         %ul

data/config/initializers/assets.rb

@@ -1,6 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths += %w( adminsite/admin )
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "2.1.1" unless defined?(Adminsite::VERSION)
+  VERSION = "2.1.2" unless defined?(Adminsite::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails