summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorEvelyn <evy_mcr@outlook.com>2015-09-20 13:53:53 -0500
committerEvelyn <evy_mcr@outlook.com>2015-09-20 13:53:53 -0500
commit9c350b60e87a58e4fcf748fe3c9bc1baa5c04655 (patch)
treec4fd007e20381daa16ce57ee4f4fcdc8fb8dca2e /app/controllers
parent3e8771097ab7392560fdf07a85c011c23098fd1e (diff)
adding ability to disable/enable users by admin
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/sessions_controller.rb9
-rw-r--r--app/controllers/users_controller.rb6
2 files changed, 13 insertions, 2 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 66eba40..34d4f53 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -32,4 +32,13 @@ class SessionsController < ApplicationController
# throw :warden, response.finish
#end
+ Warden::Manager.after_set_user do |user, auth, opts|
+ scope = opts[:scope]
+ unless user.enabled?
+ auth.logout(scope)
+ throw(:warden, scope: scope, reason: "User not active")
+ end
+ end
+
+
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3943afc..446b726 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -49,13 +49,15 @@ class UsersController < ApplicationController
def deactivate
@user.enabled = false
@user.save
- respond_with @user
+ flash[:notice] = I18n.t("actions.user_disabled_message", username: @user.username)
+ redirect_to :back
end
def enable
@user.enabled = true
@user.save
- respond_with @user
+ flash[:notice] = I18n.t("actions.user_enabled_message", username: @user.username)
+ redirect_to :back
end
def destroy