From a413f22e126e095ba8754e9c49a442e78f493acd Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 5 Jul 2019 22:37:07 +0100 Subject: [PATCH] Remove unnecessary dependency to spree/users helper --- app/controllers/spree/checkout_controller.rb | 2 -- app/controllers/spree/user_passwords_controller.rb | 2 +- app/controllers/spree/user_registrations_controller.rb | 2 +- app/controllers/spree/user_sessions_controller.rb | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/checkout_controller.rb b/app/controllers/spree/checkout_controller.rb index b75418f179..f4fa56f492 100644 --- a/app/controllers/spree/checkout_controller.rb +++ b/app/controllers/spree/checkout_controller.rb @@ -27,8 +27,6 @@ module Spree before_filter :check_registration, :except => [:registration, :update_registration] - helper 'spree/users' - def registration @user = Spree::User.new end diff --git a/app/controllers/spree/user_passwords_controller.rb b/app/controllers/spree/user_passwords_controller.rb index f18570a4fd..0638fa8d9e 100644 --- a/app/controllers/spree/user_passwords_controller.rb +++ b/app/controllers/spree/user_passwords_controller.rb @@ -1,5 +1,5 @@ class Spree::UserPasswordsController < Devise::PasswordsController - helper 'spree/users', 'spree/base', 'spree/store' + helper 'spree/base', 'spree/store' if defined?(Spree::Dash) helper 'spree/analytics' diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb index d36a3896be..4eeacb054c 100644 --- a/app/controllers/spree/user_registrations_controller.rb +++ b/app/controllers/spree/user_registrations_controller.rb @@ -1,5 +1,5 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController - helper 'spree/users', 'spree/base', 'spree/store' + helper 'spree/base', 'spree/store' if defined?(Spree::Dash) helper 'spree/analytics' diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index 98ae252b1e..fee05ebf84 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -1,5 +1,5 @@ class Spree::UserSessionsController < Devise::SessionsController - helper 'spree/users', 'spree/base', 'spree/store' + helper 'spree/base', 'spree/store' if defined?(Spree::Dash) helper 'spree/analytics' end