diff options
| author | Azul <azul@leap.se> | 2014-07-14 15:49:31 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-07-14 15:58:30 +0200 |
| commit | 67f70b31bd16b05759e1f8393f077ee17f2c34be (patch) | |
| tree | c269a2a342fdc6974cbf55586eb12832bb45e25e /app/controllers/users_controller.rb | |
| parent | f07c952c870bfb8634ef0d80737b67a1eec760f6 (diff) | |
move fetch_user into module so it can be mixed in
We have an ApiController that wants to call #fetch_user. Since we can only inherit from one class i moved fetch_user into an extension.
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0f822cb..dcf7607 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,7 +2,8 @@ # This is an HTML-only controller. For the JSON-only controller, see v1/users_controller.rb # -class UsersController < UsersBaseController +class UsersController < ApplicationController + include ControllerExtension::FetchUser before_filter :require_login, :except => [:new] before_filter :redirect_if_logged_in, :only => [:new] |