summaryrefslogtreecommitdiff
path: root/users/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-01-17 11:28:27 -0800
committerjessib <jessib@leap.se>2013-01-17 11:28:27 -0800
commita4105f068e6f8ce89fbba475048f2a1e02e0fcbc (patch)
tree91353015c71c5e2b73c416f1b6974423c1298632 /users/app/controllers/users_controller.rb
parentdc16c6f8e5382f9e5470eb2a40081d41f4112437 (diff)
parent6347fdbe0d932e78dfa8259bf81355edb19508e9 (diff)
Merge branch 'master' into feature/tickets_controllers_simplification
Conflicts: users/app/controllers/users_controller.rb
Diffstat (limited to 'users/app/controllers/users_controller.rb')
-rw-r--r--users/app/controllers/users_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index b705f47..a8ba1ab 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -2,8 +2,9 @@ class UsersController < ApplicationController
skip_before_filter :verify_authenticity_token, :only => [:create]
+
before_filter :authorize
- before_filter :fetch_user, :only => [:edit, :update, :destroy]
+ before_filter :fetch_user, :only => [:show, :edit, :update, :destroy]
before_filter :set_anchor, :only => [:edit, :update]
before_filter :authorize_admin, :only => [:index]