active_scaffold 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d35f441c2847444fd7e591e529085d3613774e19b0dc2b87a6a7e046e39eb95a
-  data.tar.gz: 5028894d44f4ed52a7e3cf7f4f92d38d86c48221815ccbb2f28396ecbda447ec
+  metadata.gz: a5f95a3c7624f3802f29e275341ce3184e9979d91644b48395126b4009fd103e
+  data.tar.gz: af61fae0cf8128ec58d90f4e40b6cbdb95400d5491e790a638bafb1dd8bb4909
 SHA512:
-  metadata.gz: 0d92dc0e4e6933a0849269191d4b273083e6914606a3198ccd132754f1ef4607434d7ef5cf6e51268aa34c7c926613f75214aa5b1ac961a0784ca5b8a34133c3
-  data.tar.gz: b87a086b26a98a148a485fe9af2c55e483dbbb82a1ccc4231d7e468a4f5265022bef3899e05ae6e6af1fef63295456f43f2456ba17043f42e42a7a796bcdffde
+  metadata.gz: 35795f0bf6eb16148401b4df273c93a02064a3c25d100e58aa17c9de97f48629be77ad4043e30e73e25e208f49318a4ffe877f1d0a2ffee61147fa2cfe8dcc0d
+  data.tar.gz: 8be4d03e807f6a621b7812854d062d472d51047399e435303be25ce85522a29486b8d4d48acf6b7d2e72f22def1960c8801e6409bc45651483d15ff2ec9c9a94

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+= 3.6.3
+- Fix search on nested or embedded lists with rails_ujs
+- Fix inplace edit when collection action link opens a view with table and th
+
 = 3.6.2
 - Fix count query when association's primary key is string
 - Fix unauthorized_columns and constraint_columns with threadsafe enabled

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

@@ -1024,7 +1024,7 @@ var ActiveScaffold = {
 
       if (my_parent.is('td')) {
         var column_no = my_parent.prevAll('td').length;
-        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
+        column_heading = my_parent.closest('table').find('th:eq(' + column_no + ')');
       } else if (my_parent.is('th')) {
         column_heading = my_parent;
       }

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -9,8 +9,16 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
+  
   <ol class="form">
     <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -10,8 +10,15 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options do %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 2
+    PATCH = 3
 
     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.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery