lib/avo/fields/has_base_field.rb in avo-2.15.3 vs lib/avo/fields/has_base_field.rb in avo-2.16.0

@@ -28,11 +28,11 @@
       def use_resource
         App.get_resource @use_resource
       end
 
       def resource
-        Avo::App.get_resource_by_model_name @model.class
+        @resource || Avo::App.get_resource_by_model_name(@model.class)
       end
 
       def turbo_frame
         "#{self.class.name.demodulize.to_s.underscore}_#{display}_#{frame_id}"
       end
@@ -105,9 +105,13 @@
 
       private
 
       def frame_id
         use_resource.present? ? use_resource.route_key.to_sym : @id
+      end
+
+      def default_view
+        Avo.configuration.skip_show_view ? :edit : :show
       end
     end
   end
 end