active_scaffold 3.7.3 → 3.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.rdoc +7 -0
- data/app/assets/javascripts/active_scaffold.js.erb +14 -12
- data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb +9 -7
- data/app/views/active_scaffold_overrides/_search.html.erb +1 -1
- data/lib/active_scaffold/finder.rb +1 -1
- data/lib/active_scaffold/version.rb +3 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9206609200e1c9330a6e04b1731300dad5fcba8a52c70ae26ef6ba6427da4c25
|
|
4
|
+
data.tar.gz: 0b501f82598b99ff587b1fa484d017a73f1fd018b5a26a7968c065d0152ae74b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '08c1c4a3b4dad7c731793ebecd4e238a36ee49e340964c8321a88b562fafbf0b12d7992501c5ffad8efa60820a40e80879f0c9e60715cc1da2e31a5c764781bc'
|
|
7
|
+
data.tar.gz: 310c5bf214800a98efd1d7af45b771608ce85cdf27db3df8437a0ea9cbabb243f2df8d8ee3603c81a9e43a76ba09dcaae20df26aa3a1b0df9bf0b18f2c244bab
|
data/CHANGELOG.rdoc
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
= 3.7.4
|
|
2
|
+
- Support loading both jquery and jquery-ui externally
|
|
3
|
+
- Fix subquery in search with STI
|
|
4
|
+
|
|
5
|
+
= 3.7.3.1
|
|
6
|
+
- Fix search, view was broken when reset_form was added
|
|
7
|
+
|
|
1
8
|
= 3.7.3
|
|
2
9
|
- Escape _ and % when using search with LIKE
|
|
3
10
|
- Fix ID in nested scaffolds when parent record has string primary key, with invalid chars for HTML ID
|
|
@@ -3,18 +3,20 @@
|
|
|
3
3
|
when :jquery
|
|
4
4
|
require_asset "getprototypeof"
|
|
5
5
|
require_asset "jquery.ba-throttle-debounce"
|
|
6
|
-
if
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
6
|
+
if Object.const_defined?('Jquery')
|
|
7
|
+
if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION')
|
|
8
|
+
require_asset "jquery-ui"
|
|
9
|
+
elsif Jquery.const_defined? 'Ui'
|
|
10
|
+
jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
|
|
11
|
+
jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
|
|
12
|
+
require_asset "#{jquery_ui_prefix}core"
|
|
13
|
+
require_asset "#{jquery_ui_prefix}effect"
|
|
14
|
+
require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'
|
|
15
|
+
require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}sortable"
|
|
16
|
+
require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}draggable"
|
|
17
|
+
require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}droppable"
|
|
18
|
+
require_asset "#{jquery_ui_prefix}#{jquery_ui_widgets_prefix}datepicker"
|
|
19
|
+
end
|
|
18
20
|
end
|
|
19
21
|
if ActiveScaffold.jquery_ui_included?
|
|
20
22
|
require_asset "jquery-ui-timepicker-addon"
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
<% if
|
|
2
|
-
<%
|
|
3
|
-
<%
|
|
4
|
-
<%
|
|
5
|
-
<%
|
|
6
|
-
|
|
7
|
-
<%
|
|
1
|
+
<% if Object.const_defined?('Jquery') %>
|
|
2
|
+
<% if Jquery.const_defined?('Rails') && Jquery::Rails.const_defined?('JQUERY_UI_VERSION') %>
|
|
3
|
+
<% require_asset "jquery-ui" %>
|
|
4
|
+
<% elsif Jquery.const_defined? 'Ui' %>
|
|
5
|
+
<% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
|
|
6
|
+
<% require_asset "jquery.ui.datepicker" %>
|
|
7
|
+
<% else %>
|
|
8
|
+
<% require_asset "jquery-ui/datepicker" %>
|
|
9
|
+
<% end %>
|
|
8
10
|
<% end %>
|
|
9
11
|
<% end %>
|
|
10
12
|
<% require_asset "jquery-ui-theme" if ActiveScaffold.jquery_ui_included? %>
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
<%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
|
|
24
24
|
<%
|
|
25
25
|
reset_attrs = {class: 'as_cancel reset'}
|
|
26
|
-
if active_scaffold_config.
|
|
26
|
+
if active_scaffold_config.search.reset_form
|
|
27
27
|
reset_attrs[:data] = {reset: true}
|
|
28
28
|
else
|
|
29
29
|
reset_attrs.merge! remote: true, data: {refresh: true}
|
|
@@ -146,7 +146,7 @@ module ActiveScaffold
|
|
|
146
146
|
conditions.concat options[:conditions][1..-1] if options[:conditions]
|
|
147
147
|
if column.association&.polymorphic?
|
|
148
148
|
conditions[0] << " AND #{column.quoted_foreign_type} = ?"
|
|
149
|
-
conditions << relation.
|
|
149
|
+
conditions << relation.base_class.sti_name
|
|
150
150
|
end
|
|
151
151
|
conditions
|
|
152
152
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: active_scaffold
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.7.
|
|
4
|
+
version: 3.7.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Many, see README
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-05-
|
|
11
|
+
date: 2024-05-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|