Merge master (with primary taxons restored)

app/controllers/application_controller.rb

@@ -4,6 +4,11 @@ class ApplicationController < ActionController::Base
 
   include EnterprisesHelper
 
+  def redirect_to(options = {}, response_status = {})
+    ::Rails.logger.error("Redirected by #{caller(1).first rescue "unknown"}")
+    super(options, response_status)
+  end
+
   def after_sign_in_path_for(resource)
     if request.referer and referer_path = URI(request.referer).path
       [main_app.checkout_path].include?(referer_path) ? referer_path : root_path

app/controllers/spree/admin/base_controller_decorator.rb

@@ -11,4 +11,16 @@ Spree::Admin::BaseController.class_eval do
     authorize! :admin, record
     authorize! action, record
   end
+
+  # This is in Spree::Core::ControllerHelpers::Auth
+  # But you can't easily reopen modules in Ruby
+  def unauthorized
+    if try_spree_current_user
+      flash[:error] = t(:authorization_failure)
+      redirect_to '/unauthorized'
+    else
+      store_location
+      redirect_to root_path(anchor: "login?after_login=#{request.env['PATH_INFO']}")
+    end
+  end
 end

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -15,11 +15,10 @@ Spree::Admin::OrdersController.class_eval do
         per(params[:per_page] || Spree::Config[:orders_per_page])
     } } }
 
-
   private
 
   def load_spree_api_key
     current_user.generate_spree_api_key! unless spree_current_user.spree_api_key
     @spree_api_key = spree_current_user.spree_api_key
   end
-end
+end

app/controllers/spree/admin/overview_controller_decorator.rb

@@ -4,16 +4,5 @@ Spree::Admin::OverviewController.class_eval do
     @product_count = Spree::Product.active.managed_by(spree_current_user).count
     @order_cycle_count = OrderCycle.active.managed_by(spree_current_user).count
   end
-
-  # This is in Spree::Core::ControllerHelpers::Auth
-  # But you can't easily reopen modules in Ruby
-  def unauthorized
-    if try_spree_current_user
-      flash[:error] = t(:authorization_failure)
-      redirect_to '/unauthorized'
-    else
-      store_location
-      redirect_to root_path(anchor: "login?after_login=#{spree.admin_path}")
-    end
-  end
 end
+