Support rails 6.1

amiel · amiel · commit bc1e58167af7 · 2024-08-21T15:48:19.000-07:00
but use tag.attributes if available
diff --git a/lib/active_admin/views/components/active_admin_form.rb b/lib/active_admin/views/components/active_admin_form.rb
@@ -132,11 +132,23 @@ def build(form_builder, *args, &block)
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? "<legend class=\"fieldset-title\">#{ERB::Util.html_escape(legend)}</legend>" : ""
-        fieldset_attrs = tag.attributes html_options
+        fieldset_attrs = tag_attributes html_options
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)
       end
+
+      private
+
+      def tag_attributes(html_options)
+        if Rails::VERSION::MAJOR <= 6
+          # Reimplement tag.attributes to backport support for Rails 6.1.
+          # TODO: this can be removed when support for Rails 6.x is dropped
+          tag.tag_options(html_options.to_h).to_s.strip.html_safe
+        else
+          tag.attributes html_options
+        end
+      end
     end
 
     class SemanticActionsProxy < FormtasticProxy
