Merge branch 'fix/invalid_date_time' of github.com:avo-hq/avo into fi…

…x/invalid_date_time
avo-hq · Jan 4, 2024 · 6b59894 · 6b59894
2 parents 1c54931 + 6f485d9
commit 6b59894
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/components/avo/fields/has_one_field/show_component.html.erb b/app/components/avo/fields/has_one_field/show_component.html.erb
@@ -1,5 +1,5 @@
 <% if @field.value %>
-  <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>"  loading=<%= loading %> target="_top" class="block">
+  <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>"  loading=<%= turbo_frame_loading %> target="_top" class="block">
     <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
   </turbo-frame>
 <% else %>

diff --git a/lib/avo/fields/concerns/frame_loading.rb b/lib/avo/fields/concerns/frame_loading.rb
@@ -4,10 +4,8 @@ module Concerns
       module FrameLoading
         extend ActiveSupport::Concern
 
-        def turbo_frame_loading = kwargs[:turbo_frame_loading]
-
-        def loading
-          turbo_frame_loading || params[:turbo_frame_loading] || "eager"
+        def turbo_frame_loading
+          kwargs[:turbo_frame_loading] || params[:turbo_frame_loading] || "eager"
         end
       end
     end