lib/avo/fields/belongs_to_field.rb in avo-3.0.0.pre13 vs lib/avo/fields/belongs_to_field.rb in avo-3.0.0.pre14

@@ -111,20 +111,20 @@
         values_for_type
       end
 
       def values_for_type(model = nil)
         resource = target_resource
-        resource = Avo::App.resources.get_resource_by_model_class model if model.present?
+        resource = Avo.resource_manager.get_resource_by_model_class model if model.present?
 
-        query = resource.class.query_scope
+        query = resource.query_scope
 
         if attach_scope.present?
           query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_model).handle
         end
 
         query.all.map do |record|
-          [resource.hydrate(record: record).record_title, record.id]
+          [resource.new(record: record).record_title, record.id]
         end
       end
 
       def database_value
         target_resource.id
@@ -178,11 +178,12 @@
       def relation_model_class
         @resource.model_class
       end
 
       def label
-        target_resource.hydrate(record: value).record_title
+        return if target_resource.blank?
+        target_resource.new(record: value)&.record_title
       end
 
       def to_permitted_param
         if polymorphic_as.present?
           return ["#{polymorphic_as}_type".to_sym, "#{polymorphic_as}_id".to_sym]
@@ -230,21 +231,21 @@
       def target_resource
         return use_resource if use_resource.present?
 
         if is_polymorphic?
           if value.present?
-            return Avo::App.resources.get_resource_by_model_class(value.class)
+            return Avo.resource_manager.get_resource_by_model_class(value.class)
           else
             return nil
           end
         end
 
         reflection_key = polymorphic_as || id
 
         if @record._reflections[reflection_key.to_s].klass.present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
         elsif @record._reflections[reflection_key.to_s].options[:class_name].present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
         else
           App.get_resource_by_name reflection_key.to_s
         end
       end