From 5020eb4e32e4dd8ad126e58281262914e6099125 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 2 Apr 2015 14:14:16 +1100 Subject: [PATCH] And again: override redirect to index page when editing properties from edit page --- app/controllers/admin/enterprises_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index aad2430570..b9ae54339b 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -184,7 +184,8 @@ module Admin # Overriding method on Spree's resource controller def location_after_save - if params[:enterprise].key? :producer_properties_attributes && request.referrer != main_app.edit_admin_enterprise_path(@enterprise) + refered_from_edit = URI(request.referer).path == main_app.edit_admin_enterprise_path(@enterprise) + if params[:enterprise].key?(:producer_properties_attributes) && !refered_from_edit main_app.admin_enterprises_path else main_app.edit_admin_enterprise_path(@enterprise)