avo 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2cf52d21a00b0daaa30cbf6547ee007afa3a5b72e260ab960ddf7c3bbfea52
-  data.tar.gz: c52f5c54105adda8a4f4efbbe98fe1b566dd27558d4e9117e076e20e8150de82
+  metadata.gz: 9cab03834ddaad490fcd3f0eb64f9ac2006dacb235c2ffb34a451139da31444a
+  data.tar.gz: 20c9770b7b259b0207857e4b70450b73748c5d30b7dd405662b720e5f97499ba
 SHA512:
-  metadata.gz: 9be08eef4e6edad3c6c7789ce545047a43f62ee078ad71f1a87f91469f25b11798243c5d87293b2d0bedecf86e4a871407a4acd7c9e615430425bf83c508685a
-  data.tar.gz: 53fa38417217d0a51ccbcd0768e882e9dd311a21c30d4b091019ec9724c0482fafe1182b4911505a5172ad2fbb9e8d14bfce5d56b6f3696b80f9730bbe4742a8
+  metadata.gz: e024dbbb67133f849c0b45b65694ba6322bf8e07d5ae399280e9e233b54bf26ee954aaabf8eebdfd81e33db79b007ce78a73be5fc99e5fb3b5089b4a75121d81
+  data.tar.gz: 1d52cf19ca6a8a831222fd36762862de3e88f8f02c4469eaa19e98844da6f707677120e0f92d13bb47caed37fa3e7cf3f24b6f7f10a049805cbe222a3653fb42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (0.4.4)
+    avo (0.4.5)
       countries
       httparty
       i18n-js

data/lib/avo/app/fields/belongs_to.rb

@@ -22,7 +22,8 @@ module Avo
         fields[:searchable] = @searchable
         fields[:is_relation] = true
         fields[:database_id] = foreign_key model
-        target_resource = App.get_resources.find { |r| r.class == "Avo::Resources::#{name}".safe_constantize }
+
+        target_resource = get_target_resource model
 
         relation_model = model.public_send(@relation_method)
 
@@ -61,6 +62,16 @@ module Avo
           model.class.reflections[@relation_method].foreign_key
         end
       end
+
+      def get_target_resource(model)
+        if model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name model._reflections[id.to_s].klass.to_s
+        elsif model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name model._reflections[id.to_s].options[:class_name]
+        else
+          App.get_resource_by_name class_name.to_s
+        end
+      end
     end
   end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails