summaryrefslogtreecommitdiff
path: root/users/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-02-07 14:38:56 +0100
committerAzul <azul@leap.se>2014-02-10 14:26:30 +0100
commit3f9dc65636afb57fed441978dca4bf7d3209bd2d (patch)
treea3ede0e3b6e1f2ea952848f2c3b5b62249105d76 /users/app/controllers/users_controller.rb
parente1243d02953b4012d6bb216efc9b0606809ab4bb (diff)
rename authorize to require_login
authorize_admin -> require_admin also add require_token which will ensure token has been used for auth.
Diffstat (limited to 'users/app/controllers/users_controller.rb')
-rw-r--r--users/app/controllers/users_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index a5461cd..6b32d49 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -4,9 +4,9 @@
class UsersController < UsersBaseController
- before_filter :authorize, :only => [:show, :edit, :update, :destroy]
+ before_filter :require_login, :except => [:new]
+ before_filter :require_admin, :only => [:index, :deactivate, :enable]
before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
- before_filter :authorize_admin, :only => [:index, :deactivate, :enable]
respond_to :html