Merge branch 'master' of github.com:bogdan/datagrid

bogdan · Sep 27, 2024 · f7770c3 · f7770c3
2 parents 5e90099 + 993c7c1
commit f7770c3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/datagrid.rb b/lib/datagrid.rb
@@ -14,10 +14,14 @@ module Datagrid
   autoload :Configuration
 
   autoload :Helper
-  ActionView::Base.send(:include, Datagrid::Helper)
+  ::ActiveSupport.on_load(:action_view) do
+    ActionView::Base.send(:include, Datagrid::Helper)
+  end
 
   autoload :FormBuilder
-  ActionView::Helpers::FormBuilder.send(:include, Datagrid::FormBuilder)
+  ::ActiveSupport.on_load(:action_view) do
+    ActionView::Helpers::FormBuilder.send(:include, Datagrid::FormBuilder)
+  end
 
   autoload :Renderer