8000 Bump Formtastic to 5.0 and remove legacy code (#8613) · activeadmin/activeadmin@519e1b9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 519e1b9

Browse files
taglialatagliala
authored
Bump Formtastic to 5.0 and remove legacy code (#8613)
This commit addresses TODO notes in the code related to Formtastic < 4 and sets the minimum required Formtastic version to >= 5.0
1 parent 841a686 commit 519e1b9

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

‎Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PATH
44
activeadmin (4.0.0.beta15)
55
arbre (~> 2.0)
66
csv
7-
formtastic (>= 3.1)
8-
formtastic_i18n (>= 0.4)
7+
formtastic (>= 5.0)
8+
formtastic_i18n (>= 0.7)
99
inherited_resources (~> 2.0)
1010
kaminari (>= 1.2.1)
1111
railties (>= 7.0)

‎activeadmin.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
3333

3434
s.add_dependency "arbre", "~> 2.0"
3535
s.add_dependency "csv"
36-
s.add_dependency "formtastic", ">= 3.1"
37-
s.add_dependency "formtastic_i18n", ">= 0.4"
36+
s.add_dependency "formtastic", ">= 5.0"
37+
s.add_dependency "formtastic_i18n", ">= 0.7"
3838
s.add_dependency "inherited_resources", "~> 2.0"
3939
s.add_dependency "kaminari", ">= 1.2.1"
4040
s.add_dependency "railties", ">= 7.0"

‎gemfiles/rails_70/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PATH
44
activeadmin (4.0.0.beta15)
55
arbre (~> 2.0)
66
csv
7-
formtastic (>= 3.1)
8-
formtastic_i18n (>= 0.4)
7+
formtastic (>= 5.0)
8+
formtastic_i18n (>= 0.7)
99
inherited_resources (~> 2.0)
1010
kaminari (>= 1.2.1)
1111
railties (>= 7.0)

‎gemfiles/rails_71/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PATH
44
activeadmin (4.0.0.beta15)
55
arbre (~> 2.0)
66
csv
7-
formtastic (>= 3.1)
8-
formtastic_i18n (>= 0.4)
7+
formtastic (>= 5.0)
8+
formtastic_i18n (>= 0.7)
99
inherited_resources (~> 2.0)
1010
kaminari (>= 1.2.1)
1111
railties (>= 7.0)

‎gemfiles/rails_72/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PATH
44
activeadmin (4.0.0.beta15)
55
arbre (~> 2.0)
66
csv
7-
formtastic (>= 3.1)
8-
formtastic_i18n (>= 0.4)
7+
formtastic (>= 5.0)
8+
formtastic_i18n (>= 0.7)
99
inherited_resources (~> 2.0)
1010
kaminari (>= 1.2.1)
1111
railties (>= 7.0)

‎lib/active_admin/filters/forms.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ class FormBuilder < ::ActiveAdmin::FormBuilder
77
include ::ActiveAdmin::Filters::FormtasticAddons
88
self.input_namespaces = [::Object, ::ActiveAdmin::Inputs::Filters, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
99

10-
# TODO: remove input class finders after formtastic 4 (where it will be default)
11-
self.input_class_finder = ::Formtastic::InputClassFinder
12-
1310
def filter(method, options = {})
1411
if method.present? && options[:as] ||= default_input_type(method)
1512
template.concat input(method, options)

‎lib/active_admin/form_builder.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ class FormBuilder < ::Formtastic::FormBuilder
1717

1818
self.input_namespaces = [::Object, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
1919

20-
# TODO: remove both class finders after formtastic 4 (where it will be default)
21-
self.input_class_finder = ::Formtastic::InputClassFinder
22-
self.action_class_finder = ::Formtastic::ActionClassFinder
23-
2420
def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
2521
li_attrs[:class] ||= "action cancel"
2622
html_options[:class] ||= "cancel-link"

0 commit comments

Comments
 (0)
0