active_scaffold 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a98ff18a1304b530e77ea7d79781e8cfa820ae8aa04e0837f69db834b256a62b
-  data.tar.gz: de7d48e31ea6e5656f4eb6468b9c1cb87f1f199298a2a0feaa9ac7e970153f08
+  metadata.gz: 9206609200e1c9330a6e04b1731300dad5fcba8a52c70ae26ef6ba6427da4c25
+  data.tar.gz: 0b501f82598b99ff587b1fa484d017a73f1fd018b5a26a7968c065d0152ae74b
 SHA512:
-  metadata.gz: c567dfec6b211cc3af398b065ddb1eafb80b6c552253966de9caab3aadc288d755b6382c06b83d92bb9090f76e98bcc626bdf1ee1f45c0631128d0a4bcc20090
-  data.tar.gz: 99320dfb881c55c8126ad098f299d3b3230e15e874c013532529e98bb8ee71daa7c0b80b1f77b2501b3a68b109c253f19b649024fc1fcea3d06ca2242bba576e
+  metadata.gz: '08c1c4a3b4dad7c731793ebecd4e238a36ee49e340964c8321a88b562fafbf0b12d7992501c5ffad8efa60820a40e80879f0c9e60715cc1da2e31a5c764781bc'
+  data.tar.gz: 310c5bf214800a98efd1d7af45b771608ce85cdf27db3df8437a0ea9cbabb243f2df8d8ee3603c81a9e43a76ba09dcaae20df26aa3a1b0df9bf0b18f2c244bab

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+= 3.7.4
+- Support loading both jquery and jquery-ui externally
+- Fix subquery in search with STI
+
+= 3.7.3.1
+- Fix search, view was broken when reset_form was added
+
 = 3.7.3
 - Escape _ and % when using search with LIKE
 - Fix ID in nested scaffolds when parent record has string primary key, with invalid chars for HTML ID

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

@@ -3,18 +3,20 @@
   when :jquery
     require_asset "getprototypeof"
     require_asset "jquery.ba-throttle-debounce"
-    if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION'
-      require_asset "jquery-ui"
-    elsif Jquery.const_defined? 'Ui'
-      jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
-      jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
-      require_asset "#{jquery_ui_prefix}core"
-      require_asset "#{jquery_ui_prefix}effect"
-      require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
-      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"
-      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}draggable"
-      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}droppable"
-      require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}datepicker"
+    if Object.const_defined?('Jquery')
+      if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION')
+        require_asset "jquery-ui"
+      elsif Jquery.const_defined? 'Ui'
+        jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
+        jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
+        require_asset "#{jquery_ui_prefix}core"
+        require_asset "#{jquery_ui_prefix}effect"
+        require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
+        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"
+        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}draggable"
+        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}droppable"
+        require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}datepicker"
+      end
     end
     if ActiveScaffold.jquery_ui_included?
       require_asset "jquery-ui-timepicker-addon"

data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb

@@ -1,10 +1,12 @@
-<% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
-  <% require_asset "jquery-ui" %>
-<% elsif Jquery.const_defined? 'Ui' %>
-  <% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
-    <% require_asset "jquery.ui.datepicker" %>
-  <% else %>
-    <% require_asset "jquery-ui/datepicker" %>
+<% if Object.const_defined?('Jquery') %>
+  <% if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION') %>
+    <% require_asset "jquery-ui" %>
+  <% elsif Jquery.const_defined? 'Ui' %>
+    <% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
+      <% require_asset "jquery.ui.datepicker" %>
+    <% else %>
+      <% require_asset "jquery-ui/datepicker" %>
+    <% end %>
   <% end %>
 <% end %>
 <% require_asset "jquery-ui-theme" if ActiveScaffold.jquery_ui_included? %>

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

@@ -23,7 +23,7 @@
   <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
   <%
     reset_attrs = {class: 'as_cancel reset'}
-    if active_scaffold_config.field_search.reset_form
+    if active_scaffold_config.search.reset_form
       reset_attrs[:data] = {reset: true}
     else
       reset_attrs.merge! remote: true, data: {refresh: true}

data/lib/active_scaffold/finder.rb

@@ -146,7 +146,7 @@ module ActiveScaffold
         conditions.concat options[:conditions][1..-1] if options[:conditions]
         if column.association&.polymorphic?
           conditions[0] << " AND #{column.quoted_foreign_type} = ?"
-          conditions << relation.name
+          conditions << relation.base_class.sti_name
         end
         conditions
       end

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails