Permalink
Browse files

Remove current_ability, current_spree_user and unauthorized dupe meth…

…ods in BaseController

They were placed there from the rebase
  • Loading branch information...
1 parent 3142e7d commit a6f1f99e176a39ac10a6eade7753b9a99973408a @radar radar committed May 29, 2012
Showing with 1 addition and 44 deletions.
  1. +0 −44 core/app/controllers/spree/base_controller.rb
  2. +1 −0 core/lib/spree/core/controller_helpers.rb
@@ -1,48 +1,4 @@
-require 'cancan'
-
class Spree::BaseController < ApplicationController
include Spree::Core::ControllerHelpers
include Spree::Core::RespondWith
-
- # graceful error handling for cancan authorization exceptions
- rescue_from CanCan::AccessDenied do |exception|
- return unauthorized
- end
-
- private
-
- def current_spree_user
- if Spree.user_class && Spree.current_user_method
- send(Spree.current_user_method)
- else
- Object.new
- end
- end
-
- # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
- def current_ability
- @current_ability ||= Spree::Ability.new(current_spree_user)
- end
- # Redirect as appropriate when an access request fails. The default action is to redirect to the login screen.
- # Override this method in your controllers if you want to have special behavior in case the user is not authorized
- # to access the requested action. For example, a popup window might simply close itself.
- def unauthorized
- respond_to do |format|
- format.html do
- if current_user
- flash.now[:error] = t(:authorization_failure)
- render 'spree/shared/unauthorized', :layout => '/spree/layouts/spree_application', :status => 401
- else
- store_location
- redirect_to spree.login_path and return
- end
- end
- format.xml do
- request_http_basic_authentication 'Web Password'
- end
- format.json do
- render :text => "Not Authorized \n", :status => 401
- end
- end
- end
end
@@ -1,3 +1,4 @@
+require 'cancan'
module Spree
module Core
module ControllerHelpers

0 comments on commit a6f1f99

Please sign in to comment.