diff options
author | Azul <azul@riseup.net> | 2016-05-23 12:17:31 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-05-23 13:01:51 +0200 |
commit | f47fc9d6522886cf81cfea26ec1f396219c539ba (patch) | |
tree | b63490a1e515c211a15b9c3aa062a09927739c77 /app/controllers/users_controller.rb | |
parent | 7f0c42a5fa6d6c1952e53b9b73bad0202f746f3e (diff) |
move signup from users to account_controller
There was a lot of special case handling going on in the users_controller
for this. Lot simpler this way.
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2816a64..4d198b9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,11 +5,9 @@ class UsersController < ApplicationController include ControllerExtension::FetchUser - before_filter :require_login, :except => [:new] - before_filter :redirect_if_logged_in, :only => [:new] + before_filter :require_login before_filter :require_admin, :only => [:index, :deactivate, :enable] before_filter :fetch_user, :only => [:show, :edit, :destroy, :deactivate, :enable] - before_filter :require_registration_allowed, only: :new respond_to :html @@ -27,10 +25,6 @@ class UsersController < ApplicationController @users = @users.limit(100) end - def new - @user = User.new - end - def show end @@ -64,12 +58,6 @@ class UsersController < ApplicationController protected - def require_registration_allowed - unless APP_CONFIG[:allow_registration] - redirect_to home_path - end - end - def user_params if admin? params.require(:user).permit(:effective_service_level) |