activeadmin 2.10.1 → 2.11.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activeadmin might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +35 -0
- data/app/assets/javascripts/active_admin/base.js +1 -1
- data/app/assets/stylesheets/active_admin/_forms.scss +0 -9
- data/app/assets/stylesheets/active_admin/mixins/_variables.scss +9 -0
- data/app/javascript/active_admin/initializers/has-many.js +4 -1
- data/docs/5-forms.md +1 -1
- data/docs/Gemfile.lock +29 -28
- data/lib/active_admin/base_controller/authorization.rb +1 -1
- data/lib/active_admin/csv_builder.rb +2 -2
- data/lib/active_admin/engine.rb +2 -1
- data/lib/active_admin/resource.rb +2 -2
- data/lib/active_admin/resource_controller/streaming.rb +1 -1
- data/lib/active_admin/version.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 26f9266cffc8d0e054be977056ba02e2c09803db4f3690235112df2dbaa5b054
|
4
|
+
data.tar.gz: 8d7a87d3e2f53f5279cf100129149710e3886a633c902c7cd657ad0008b6c397
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f783a8a7dba38645b4c62d11c384c54ceff4a198ea90eaab237c5b87293e82033ddfcbf00e5d7fd15c346b12debdb402a5f96f9b86891576ef34cd87644d3dcd
|
7
|
+
data.tar.gz: 55cd5df702122eaac4dc70cc7a072754edc1141553056896268ac3c0c7176b8876a8bafac61fe75cec064d58d3d4b03e15b36e3d4c52102a5f6dfb5e44d47214
|
data/CHANGELOG.md
CHANGED
@@ -2,6 +2,32 @@
|
|
2
2
|
|
3
3
|
## Unreleased
|
4
4
|
|
5
|
+
## 2.11.2 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.1..v2.11.2)
|
6
|
+
|
7
|
+
### Bug Fixes
|
8
|
+
|
9
|
+
* Fix disappearing BOM option for `CSVBuilder`. [#7170] by [@Karoid]
|
10
|
+
|
11
|
+
## 2.11.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.11.0..v2.11.1)
|
12
|
+
|
13
|
+
### Enhancements
|
14
|
+
|
15
|
+
* Add turbolinks support to has many js. [#7384] by [@amiel]
|
16
|
+
|
17
|
+
### Documentation
|
18
|
+
|
19
|
+
* Remove `insert_tag` from Form-Partial docs. [#7394] by [@TonyArra]
|
20
|
+
|
21
|
+
## 2.11.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.10.1..v2.11.0)
|
22
|
+
|
23
|
+
### Enhancements
|
24
|
+
|
25
|
+
* Add Rails 7 Support. [#7235] by [@tagliala]
|
26
|
+
|
27
|
+
### Bug Fixes
|
28
|
+
|
29
|
+
* Fix form SCSS variables no longer being defined in the outermost scope, so no longer being accessible. [#7341] by [@gigorok]
|
30
|
+
|
5
31
|
## 2.10.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.10.0..v2.10.1)
|
6
32
|
|
7
33
|
### Enhancements
|
@@ -710,15 +736,20 @@ Please check [0-6-stable] for previous changes.
|
|
710
736
|
[#6959]: https://github.com/activeadmin/activeadmin/pull/6959
|
711
737
|
[#7095]: https://github.com/activeadmin/activeadmin/pull/7095
|
712
738
|
[#7127]: https://github.com/activeadmin/activeadmin/pull/7127
|
739
|
+
[#7170]: https://github.com/activeadmin/activeadmin/pull/7170
|
713
740
|
[#7181]: https://github.com/activeadmin/activeadmin/pull/7181
|
714
741
|
[#7205]: https://github.com/activeadmin/activeadmin/pull/7205
|
742
|
+
[#7235]: https://github.com/activeadmin/activeadmin/pull/7235
|
715
743
|
[#7236]: https://github.com/activeadmin/activeadmin/pull/7236
|
716
744
|
[#7262]: https://github.com/activeadmin/activeadmin/pull/7262
|
717
745
|
[#7293]: https://github.com/activeadmin/activeadmin/pull/7293
|
718
746
|
[#7332]: https://github.com/activeadmin/activeadmin/pull/7332
|
719
747
|
[#7340]: https://github.com/activeadmin/activeadmin/pull/7340
|
748
|
+
[#7341]: https://github.com/activeadmin/activeadmin/pull/7341
|
720
749
|
[#7349]: https://github.com/activeadmin/activeadmin/pull/7349
|
721
750
|
[#7350]: https://github.com/activeadmin/activeadmin/pull/7350
|
751
|
+
[#7384]: https://github.com/activeadmin/activeadmin/pull/7384
|
752
|
+
[#7394]: https://github.com/activeadmin/activeadmin/pull/7394
|
722
753
|
|
723
754
|
[@1000ship]: https://github.com/1000ship
|
724
755
|
[@5t111111]: https://github.com/5t111111
|
@@ -756,6 +787,7 @@ Please check [0-6-stable] for previous changes.
|
|
756
787
|
[@Fs00]: https://github.com/Fs00
|
757
788
|
[@fuzziness]: https://github.com/fuzziness
|
758
789
|
[@giapnhdev]: https://github.com/giapnhdev
|
790
|
+
[@gigorok]: https://github.com/gigorok
|
759
791
|
[@glebtv]: https://github.com/glebtv
|
760
792
|
[@gonzedge]: https://github.com/gonzedge
|
761
793
|
[@guigs]: https://github.com/guigs
|
@@ -775,6 +807,7 @@ Please check [0-6-stable] for previous changes.
|
|
775
807
|
[@jscheid]: https://github.com/jscheid
|
776
808
|
[@juril33t]: https://github.com/juril33t
|
777
809
|
[@jwesorick]: https://github.com/jwesorick
|
810
|
+
[@Karoid]: https://github.com/Karoid
|
778
811
|
[@kjeldahl]: https://github.com/kjeldahl
|
779
812
|
[@ko-lem]: https://github.com/ko-lem
|
780
813
|
[@kobeumut]: https://github.com/kobeumut
|
@@ -818,11 +851,13 @@ Please check [0-6-stable] for previous changes.
|
|
818
851
|
[@sprql]: https://github.com/sprql
|
819
852
|
[@stefsava]: https://github.com/stefsava
|
820
853
|
[@stereoscott]: https://github.com/stereoscott
|
854
|
+
[@tagliala]: https://github.com/tagliala
|
821
855
|
[@taralbass]: https://github.com/taralbass
|
822
856
|
[@tiagotex]: https://github.com/tiagotex
|
823
857
|
[@timoschilling]: https://github.com/timoschilling
|
824
858
|
[@TimPetricola]: https://github.com/TimPetricola
|
825
859
|
[@tomgilligan]: https://github.com/tomgilligan
|
860
|
+
[@TonyArra]: https://github.com/TonyArra
|
826
861
|
[@tordans]: https://github.com/tordans
|
827
862
|
[@utkarsh2102]: https://github.com/utkarsh2102
|
828
863
|
[@varyonic]: https://github.com/varyonic
|
@@ -392,7 +392,6 @@
|
|
392
392
|
$(document).on("change", '.has_many_container[data-sortable] :input[name$="[_destroy]"]', function() {
|
393
393
|
recompute_positions($(this).closest(".has_many"));
|
394
394
|
});
|
395
|
-
init_sortable();
|
396
395
|
$(document).on("has_many_add:after", ".has_many_container", init_sortable);
|
397
396
|
});
|
398
397
|
var init_sortable = function init_sortable() {
|
@@ -426,6 +425,7 @@
|
|
426
425
|
}
|
427
426
|
});
|
428
427
|
};
|
428
|
+
$(document).ready(init_sortable).on("page:load turbolinks:load", init_sortable);
|
429
429
|
var PerPage = function() {
|
430
430
|
function PerPage(element) {
|
431
431
|
this.element = element;
|
@@ -250,8 +250,6 @@ form {
|
|
250
250
|
|
251
251
|
// -------------------------------------- Sidebar Forms
|
252
252
|
|
253
|
-
$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
|
254
|
-
|
255
253
|
.sidebar_section {
|
256
254
|
|
257
255
|
label {
|
@@ -274,13 +272,6 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
|
|
274
272
|
|
275
273
|
// -------------------------------------- Filter Forms
|
276
274
|
|
277
|
-
$filter-field-seperator-width: 12px;
|
278
|
-
|
279
|
-
$side-by-side-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
|
280
|
-
$side-by-side-filter-select-width: ($sidebar-inner-content-width * 0.5) - $filter-field-seperator-width;
|
281
|
-
|
282
|
-
$date-range-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($filter-field-seperator-width * 0.5);
|
283
|
-
|
284
275
|
form.filter_form {
|
285
276
|
.filter_form_field {
|
286
277
|
margin-bottom: 10px;
|
@@ -40,3 +40,12 @@ $text-input-horizontal-padding: 10px !default;
|
|
40
40
|
$text-input-total-padding: $text-input-horizontal-padding * 2 + $border-width * 2;
|
41
41
|
|
42
42
|
$blank-slate-border: 1px dashed #DADADA !default;
|
43
|
+
|
44
|
+
// Sidebar Forms
|
45
|
+
$sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
|
46
|
+
|
47
|
+
// Filter Forms
|
48
|
+
$filter-field-seperator-width: 12px !default;
|
49
|
+
$side-by-side-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
|
50
|
+
$side-by-side-filter-select-width: ($sidebar-inner-content-width * 0.5) - $filter-field-seperator-width;
|
51
|
+
$date-range-filter-input-width: ($sidebar-inner-content-width * 0.5) - ($filter-field-seperator-width * 0.5);
|
@@ -57,7 +57,6 @@ $(function() {
|
|
57
57
|
recompute_positions($(this).closest('.has_many'));
|
58
58
|
});
|
59
59
|
|
60
|
-
init_sortable();
|
61
60
|
$(document).on('has_many_add:after', '.has_many_container', init_sortable);
|
62
61
|
});
|
63
62
|
|
@@ -93,3 +92,7 @@ var recompute_positions = function(parent){
|
|
93
92
|
}
|
94
93
|
});
|
95
94
|
};
|
95
|
+
|
96
|
+
$(document).
|
97
|
+
ready(init_sortable).
|
98
|
+
on('page:load turbolinks:load', init_sortable);
|
data/docs/5-forms.md
CHANGED
data/docs/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
GEM
|
2
2
|
remote: https://rubygems.org/
|
3
3
|
specs:
|
4
|
-
activesupport (6.0.4.
|
4
|
+
activesupport (6.0.4.6)
|
5
5
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
6
6
|
i18n (>= 0.7, < 2)
|
7
7
|
minitest (~> 5.1)
|
@@ -14,10 +14,9 @@ GEM
|
|
14
14
|
execjs
|
15
15
|
coffee-script-source (1.11.1)
|
16
16
|
colorator (1.1.0)
|
17
|
-
commonmarker (0.
|
18
|
-
ruby-enum (~> 0.5)
|
17
|
+
commonmarker (0.23.4)
|
19
18
|
concurrent-ruby (1.1.9)
|
20
|
-
dnsruby (1.61.
|
19
|
+
dnsruby (1.61.9)
|
21
20
|
simpleidn (~> 0.1)
|
22
21
|
em-websocket (0.5.3)
|
23
22
|
eventmachine (>= 0.12.9)
|
@@ -26,34 +25,38 @@ GEM
|
|
26
25
|
ffi (>= 1.15.0)
|
27
26
|
eventmachine (1.2.7)
|
28
27
|
execjs (2.8.1)
|
29
|
-
faraday (1.
|
28
|
+
faraday (1.10.0)
|
30
29
|
faraday-em_http (~> 1.0)
|
31
30
|
faraday-em_synchrony (~> 1.0)
|
32
31
|
faraday-excon (~> 1.1)
|
33
|
-
faraday-httpclient (~> 1.0
|
32
|
+
faraday-httpclient (~> 1.0)
|
33
|
+
faraday-multipart (~> 1.0)
|
34
34
|
faraday-net_http (~> 1.0)
|
35
|
-
faraday-net_http_persistent (~> 1.
|
35
|
+
faraday-net_http_persistent (~> 1.0)
|
36
36
|
faraday-patron (~> 1.0)
|
37
37
|
faraday-rack (~> 1.0)
|
38
|
-
|
38
|
+
faraday-retry (~> 1.0)
|
39
39
|
ruby2_keywords (>= 0.0.4)
|
40
40
|
faraday-em_http (1.0.0)
|
41
41
|
faraday-em_synchrony (1.0.0)
|
42
42
|
faraday-excon (1.1.0)
|
43
43
|
faraday-httpclient (1.0.1)
|
44
|
+
faraday-multipart (1.0.3)
|
45
|
+
multipart-post (>= 1.2, < 3)
|
44
46
|
faraday-net_http (1.0.1)
|
45
47
|
faraday-net_http_persistent (1.2.0)
|
46
48
|
faraday-patron (1.0.0)
|
47
49
|
faraday-rack (1.0.0)
|
48
|
-
|
50
|
+
faraday-retry (1.0.3)
|
51
|
+
ffi (1.15.5)
|
49
52
|
forwardable-extended (2.6.0)
|
50
53
|
gemoji (3.0.1)
|
51
|
-
github-pages (
|
54
|
+
github-pages (225)
|
52
55
|
github-pages-health-check (= 1.17.9)
|
53
56
|
jekyll (= 3.9.0)
|
54
57
|
jekyll-avatar (= 0.7.0)
|
55
58
|
jekyll-coffeescript (= 1.1.1)
|
56
|
-
jekyll-commonmark-ghpages (= 0.
|
59
|
+
jekyll-commonmark-ghpages (= 0.2.0)
|
57
60
|
jekyll-default-layout (= 0.1.4)
|
58
61
|
jekyll-feed (= 0.15.1)
|
59
62
|
jekyll-gist (= 1.5.0)
|
@@ -67,7 +70,7 @@ GEM
|
|
67
70
|
jekyll-relative-links (= 0.6.1)
|
68
71
|
jekyll-remote-theme (= 0.4.3)
|
69
72
|
jekyll-sass-converter (= 1.5.2)
|
70
|
-
jekyll-seo-tag (= 2.
|
73
|
+
jekyll-seo-tag (= 2.8.0)
|
71
74
|
jekyll-sitemap (= 1.4.0)
|
72
75
|
jekyll-swiss (= 1.0.0)
|
73
76
|
jekyll-theme-architect (= 0.2.0)
|
@@ -123,12 +126,12 @@ GEM
|
|
123
126
|
jekyll-coffeescript (1.1.1)
|
124
127
|
coffee-script (~> 2.2)
|
125
128
|
coffee-script-source (~> 1.11.1)
|
126
|
-
jekyll-commonmark (1.
|
127
|
-
commonmarker (~> 0.
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
jekyll-commonmark (~> 1.
|
129
|
+
jekyll-commonmark (1.4.0)
|
130
|
+
commonmarker (~> 0.22)
|
131
|
+
jekyll-commonmark-ghpages (0.2.0)
|
132
|
+
commonmarker (~> 0.23.4)
|
133
|
+
jekyll (~> 3.9.0)
|
134
|
+
jekyll-commonmark (~> 1.4.0)
|
132
135
|
rouge (>= 2.0, < 4.0)
|
133
136
|
jekyll-default-layout (0.1.4)
|
134
137
|
jekyll (~> 3.0)
|
@@ -160,7 +163,7 @@ GEM
|
|
160
163
|
rubyzip (>= 1.3.0, < 3.0)
|
161
164
|
jekyll-sass-converter (1.5.2)
|
162
165
|
sass (~> 3.4)
|
163
|
-
jekyll-seo-tag (2.
|
166
|
+
jekyll-seo-tag (2.8.0)
|
164
167
|
jekyll (>= 3.8, < 5.0)
|
165
168
|
jekyll-sitemap (1.4.0)
|
166
169
|
jekyll (>= 3.7, < 5.0)
|
@@ -218,34 +221,32 @@ GEM
|
|
218
221
|
kramdown-parser-gfm (1.1.0)
|
219
222
|
kramdown (~> 2.0)
|
220
223
|
liquid (4.0.3)
|
221
|
-
listen (3.7.
|
224
|
+
listen (3.7.1)
|
222
225
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
223
226
|
rb-inotify (~> 0.9, >= 0.9.10)
|
224
227
|
mercenary (0.3.6)
|
225
|
-
mini_portile2 (2.
|
228
|
+
mini_portile2 (2.8.0)
|
226
229
|
minima (2.5.1)
|
227
230
|
jekyll (>= 3.5, < 5.0)
|
228
231
|
jekyll-feed (~> 0.9)
|
229
232
|
jekyll-seo-tag (~> 2.1)
|
230
233
|
minitest (5.15.0)
|
231
234
|
multipart-post (2.1.1)
|
232
|
-
nokogiri (1.
|
233
|
-
mini_portile2 (~> 2.
|
235
|
+
nokogiri (1.13.3)
|
236
|
+
mini_portile2 (~> 2.8.0)
|
234
237
|
racc (~> 1.4)
|
235
|
-
octokit (4.
|
238
|
+
octokit (4.22.0)
|
236
239
|
faraday (>= 0.9)
|
237
240
|
sawyer (~> 0.8.0, >= 0.5.3)
|
238
241
|
pathutil (0.16.2)
|
239
242
|
forwardable-extended (~> 2.6)
|
240
243
|
public_suffix (4.0.6)
|
241
244
|
racc (1.6.0)
|
242
|
-
rb-fsevent (0.11.
|
245
|
+
rb-fsevent (0.11.1)
|
243
246
|
rb-inotify (0.10.1)
|
244
247
|
ffi (~> 1.0)
|
245
248
|
rexml (3.2.5)
|
246
249
|
rouge (3.26.0)
|
247
|
-
ruby-enum (0.9.0)
|
248
|
-
i18n
|
249
250
|
ruby2_keywords (0.0.5)
|
250
251
|
rubyzip (2.3.2)
|
251
252
|
safe_yaml (1.0.5)
|
@@ -270,7 +271,7 @@ GEM
|
|
270
271
|
unf_ext
|
271
272
|
unf_ext (0.0.8)
|
272
273
|
unicode-display_width (1.8.0)
|
273
|
-
zeitwerk (2.5.
|
274
|
+
zeitwerk (2.5.4)
|
274
275
|
|
275
276
|
PLATFORMS
|
276
277
|
ruby
|
@@ -45,9 +45,9 @@ module ActiveAdmin
|
|
45
45
|
def build(controller, csv)
|
46
46
|
@collection = controller.send :find_collection, except: :pagination
|
47
47
|
columns = exec_columns controller.view_context
|
48
|
-
bom = options
|
48
|
+
bom = options[:byte_order_mark]
|
49
49
|
column_names = options.delete(:column_names) { true }
|
50
|
-
csv_options = options.except :encoding_options, :humanize_name
|
50
|
+
csv_options = options.except :encoding_options, :humanize_name, :byte_order_mark
|
51
51
|
|
52
52
|
csv << bom if bom
|
53
53
|
|
data/lib/active_admin/engine.rb
CHANGED
@@ -1,7 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
module ActiveAdmin
|
3
3
|
class Engine < ::Rails::Engine
|
4
|
-
|
4
|
+
# Set default values for app_path and load_paths before running initializers
|
5
|
+
initializer "active_admin.load_app_path", before: :load_config_initializers do |app|
|
5
6
|
ActiveAdmin::Application.setting :app_path, app.root
|
6
7
|
ActiveAdmin::Application.setting :load_paths, [File.expand_path("app/admin", app.root)]
|
7
8
|
end
|
@@ -99,11 +99,11 @@ module ActiveAdmin
|
|
99
99
|
# The class this resource wraps. If you register the Post model, Resource#resource_class
|
100
100
|
# will point to the Post class
|
101
101
|
def resource_class
|
102
|
-
|
102
|
+
resource_class_name.constantize
|
103
103
|
end
|
104
104
|
|
105
105
|
def decorator_class
|
106
|
-
|
106
|
+
decorator_class_name&.constantize
|
107
107
|
end
|
108
108
|
|
109
109
|
def resource_name_extension
|
@@ -31,7 +31,7 @@ module ActiveAdmin
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def csv_filename
|
34
|
-
"#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.
|
34
|
+
"#{resource_collection_name.to_s.gsub('_', '-')}-#{Time.zone.now.to_date.to_formatted_s(:default)}.csv"
|
35
35
|
end
|
36
36
|
|
37
37
|
def stream_csv
|
data/lib/active_admin/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: activeadmin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.11.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Charles Maresh
|
@@ -15,7 +15,7 @@ authors:
|
|
15
15
|
autorequire:
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
|
-
date: 2022-
|
18
|
+
date: 2022-04-12 00:00:00.000000000 Z
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
21
21
|
name: arbre
|
@@ -128,7 +128,7 @@ dependencies:
|
|
128
128
|
version: '6.0'
|
129
129
|
- - "<"
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: '
|
131
|
+
version: '7.1'
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -138,7 +138,7 @@ dependencies:
|
|
138
138
|
version: '6.0'
|
139
139
|
- - "<"
|
140
140
|
- !ruby/object:Gem::Version
|
141
|
-
version: '
|
141
|
+
version: '7.1'
|
142
142
|
- !ruby/object:Gem::Dependency
|
143
143
|
name: ransack
|
144
144
|
requirement: !ruby/object:Gem::Requirement
|
@@ -578,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
578
578
|
- !ruby/object:Gem::Version
|
579
579
|
version: '0'
|
580
580
|
requirements: []
|
581
|
-
rubygems_version: 3.3.
|
581
|
+
rubygems_version: 3.3.11
|
582
582
|
signing_key:
|
583
583
|
specification_version: 4
|
584
584
|
summary: Active Admin is a Ruby on Rails plugin for generating administration style
|