Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

#1072 Cleanup Before Filter #1073

Merged
merged 2 commits into from
Jan 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,6 @@ def empty_cart
end
end

def require_login
if current_user.nil?
flash[:error] = "Sorry, that action requires you to log in."
redirect_to root_path
end
end

def terms_of_service
@tos = @app_configs.terms_of_service
render 'terms_of_service/index'
Expand Down
1 change: 0 additions & 1 deletion app/controllers/reservations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ class ReservationsController < ApplicationController

load_and_authorize_resource

before_action :require_login, only: [:index, :show]
before_action :set_reservation, only: [:show, :edit, :update, :destroy,
:checkout_email, :checkin_email, :renew, :review, :approve_request, :deny_request]
before_action :set_user, only: [:manage, :current, :checkout]
Expand Down
4 changes: 0 additions & 4 deletions spec/controllers/application_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class TestController < ApplicationController
before_filter :require_admin, only: [:method_requiring_admin]
before_filter :require_checkout_person, only: [:method_requiring_checkout_person]
before_filter :require_login, only: [:method_requiring_login]
before_filter :require_user_or_checkout_person, only: [:method_requiring_user_or_checkout_person]
before_filter :require_user, only: [:method_requiring_user]

Expand All @@ -25,9 +24,6 @@ def method_requiring_admin
def method_requiring_checkout_person
render :text => 'checkout person required!'
end
def method_requiring_login
render :text => 'you must be logged in!'
end
def method_requiring_user_or_checkout_person
render :text => 'are you a user or a checkout person?'
end
Expand Down