From fc4cf6a9a77b66d69afdcda434352feb42520261 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 31 Oct 2020 10:27:27 +0000
Subject: [PATCH] Merge resource_controller model_class method with parent
 version

---
 app/controllers/admin/resource_controller.rb     |  4 ----
 .../spree/admin/resource_controller.rb           | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/resource_controller.rb b/app/controllers/admin/resource_controller.rb
index 6d68da1044..32cacc4143 100644
--- a/app/controllers/admin/resource_controller.rb
+++ b/app/controllers/admin/resource_controller.rb
@@ -1,9 +1,5 @@
 module Admin
   class ResourceController < Spree::Admin::ResourceController
-    def model_class
-      controller_name.classify.to_s.constantize
-    end
-
     # URL helpers
     def new_object_url(options = {})
       if parent_data.present?
diff --git a/app/controllers/spree/admin/resource_controller.rb b/app/controllers/spree/admin/resource_controller.rb
index 00a36c81dc..8e370bf814 100644
--- a/app/controllers/spree/admin/resource_controller.rb
+++ b/app/controllers/spree/admin/resource_controller.rb
@@ -124,7 +124,7 @@ module Spree
       end
 
       def model_class
-        "Spree::#{controller_name.classify}".constantize
+        controller_class_name.constantize
       end
 
       def model_name
@@ -277,6 +277,20 @@ module Spree
       def new_actions
         [:new, :create]
       end
+
+      private
+
+      def controller_class_name
+        if spree_controller?
+          "Spree::#{controller_name.classify}"
+        else
+          controller_name.classify.to_s
+        end
+      end
+
+      def spree_controller?
+        controller_path.starts_with? "spree"
+      end
     end
   end
 end