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

Commit 7216dea

Browse files
committed
Merge pull request #1073 from YaleSTC/1072_cleanup_before_filter
#1072 Cleanup Before Filter
2 parents fef12c4 + 81ef4fb commit 7216dea

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

app/controllers/application_controller.rb

-7
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,6 @@ def empty_cart
223223
end
224224
end
225225

226-
def require_login
227-
if current_user.nil?
228-
flash[:error] = "Sorry, that action requires you to log in."
229-
redirect_to root_path
230-
end
231-
end
232-
233226
def terms_of_service
234227
@tos = @app_configs.terms_of_service
235228
render 'terms_of_service/index'

app/controllers/reservations_controller.rb

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ class ReservationsController < ApplicationController
22

33
load_and_authorize_resource
44

5-
before_action :require_login, only: [:index, :show]
65
before_action :set_reservation, only: [:show, :edit, :update, :destroy,
76
:checkout_email, :checkin_email, :renew, :review, :approve_request, :deny_request]
87
before_action :set_user, only: [:manage, :current, :checkout]

spec/controllers/application_controller_spec.rb

-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
class TestController < ApplicationController
44
before_filter :require_admin, only: [:method_requiring_admin]
55
before_filter :require_checkout_person, only: [:method_requiring_checkout_person]
6-
before_filter :require_login, only: [:method_requiring_login]
76
before_filter :require_user_or_checkout_person, only: [:method_requiring_user_or_checkout_person]
87
before_filter :require_user, only: [:method_requiring_user]
98

@@ -25,9 +24,6 @@ def method_requiring_admin
2524
def method_requiring_checkout_person
2625
render :text => 'checkout person required!'
2726
end
28-
def method_requiring_login
29-
render :text => 'you must be logged in!'
30-
end
3127
def method_requiring_user_or_checkout_person
3228
render :text => 'are you a user or a checkout person?'
3329
end

0 commit comments

Comments
 (0)