active_scaffold 3.4.14 → 3.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd09eacd583985f362d688856906e072120a233
-  data.tar.gz: 3d48f8933ac709ea1f6b9e4495b1144ab4510abd
+  metadata.gz: 247539a2068b350fca651a90998fd9627de11326
+  data.tar.gz: fe55bfa49b3670fed3d8015034eab74343d80aab
 SHA512:
-  metadata.gz: 15888fe68ed0b4c072285d1dab51508ac3f2f5efb90a8bcf100d84324d8ed5734b2adab150e8f456062c1300a4a1383d3922529825f2668e7cd6ffaacccd18b0
-  data.tar.gz: 74c98c0d0578b2bf00c652b4e645f9d029bceae3140dd0432c2340dd8f88461bea5bbb891577d04f90f0b52928f4ea248fe2298ad86cf9872b82ccf8bdc4c080
+  metadata.gz: 528632a5420784e879854874f60fad64d4705569021d9b57278cc2144d2301efbe2180176f23d7a521eb2cca1efe17f67abdf04cce45dc87ffed2ad4e20e16bc
+  data.tar.gz: 954b32ea74a131e29b0555612a9f2f444ccead1887a12d65be00bf80a3b14d8fca914152219603c7a31d7e3aaa63bedcd72d45118d8637246b0ef6281e19fe59

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.4.16
+- add scoped_query to list methods, so it can be used for calculations, like each_record_in_scope is used to iterate over every filtered record
+- fix field_search_ignore? and search_ignore?
+- fix reset on search forms loaded with session search
+
 = 3.4.14
 - fix filter order in AS controllers which inherit from AS controllers
 - clean code

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -127,7 +127,11 @@ jQuery(document).ready(function($) {
 
     if (action_link && action_link.position) {
       action_link.close();
-    } else if (link.hasClass('reset')) link.closest('form').get(0).reset();
+    } else if (link.hasClass('reset')) {
+      var form = link.closest('form');
+      if (form.is('.search')) form.find(':input:visible:not([type=submit])').val('');
+      else form.trigger('reset');
+    }
     return true;
   });
   jQuery(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {

data/lib/active_scaffold/actions/common_search.rb

@@ -38,10 +38,6 @@ module ActiveScaffold::Actions
       def search_params
         @search_params || active_scaffold_session_storage['search']
       end
-
-      def global_search_ignore?
-        active_scaffold_config.list.always_show_search == true
-      end
       
       # The default security delegates to ActiveRecordPermissions.
       # You may override the method to customize.

data/lib/active_scaffold/actions/field_search.rb

@@ -73,8 +73,8 @@ module ActiveScaffold::Actions
         end
       end
 
-      def search_ignore?
-        active_scaffold_config.list.always_show_search == :field_search || global_search_ignore?
+      def field_search_ignore?
+        active_scaffold_config.list.always_show_search && active_scaffold_config.list.search_partial == 'field_search'
       end
 
       private

data/lib/active_scaffold/actions/list.rb

@@ -128,10 +128,16 @@ module ActiveScaffold::Actions
     end
 
     def each_record_in_scope
-      do_search if respond_to? :do_search, true
-      set_includes_for_columns
-      # where(nil) is needed because we need a relation
-      append_to_query(beginning_of_chain.where(nil), finder_options).each {|record| yield record}
+      scoped_query.each {|record| yield record}
+    end
+
+    def scoped_query
+      @scoped_query ||= begin
+        do_search if respond_to? :do_search, true
+        set_includes_for_columns
+        # where(nil) is needed because we need a relation
+        append_to_query(beginning_of_chain.where(nil), finder_options)
+      end
     end
 
     # The default security delegates to ActiveRecordPermissions.

data/lib/active_scaffold/actions/search.rb

@@ -37,7 +37,7 @@ module ActiveScaffold::Actions
       end
 
       def search_ignore?
-        active_scaffold_config.list.always_show_search == :search || global_search_ignore?
+        active_scaffold_config.list.always_show_search && active_scaffold_config.list.search_partial == 'search'
       end
 
       private

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 14
+    PATCH = 16
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.14
+  version: 3.4.16
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda