Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Admin: Support nested friendly ID resources

Damian Legawiecf25a8ea91fab
diff --git a/admin/app/controllers/spree/admin/resource_controller.rb b/admin/app/controllers/spree/admin/resource_controller.rb
index 729b63beea..0d7fa70f1e 100644
--- a/admin/app/controllers/spree/admin/resource_controller.rb
+++ b/admin/app/controllers/spree/admin/resource_controller.rb
@@ -196,15 +196,16 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
end
def find_resource
- if parent_data.present?
- parent.send(controller_name).find(params[:id])
+ base_scope = if parent_data.present?
+ parent.send(controller_name)
+ else
+ model_class.try(:for_store, current_store) || model_class
+ end
+
+ if model_class.try(:friendly)
+ base_scope.friendly.find(params[:id])
else
- base_scope = model_class.try(:for_store, current_store) || model_class
- if model_class.try(:friendly)
- base_scope.friendly.find(params[:id])
- else
- base_scope.find(params[:id])
- end
+ base_scope.find(params[:id])
end
end