adding ability to disable/enable users by admin

4 files changed, 62 insertions, 3 deletions

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9cd3a55..bb40129 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -26,3 +26,7 @@
 // import custom scss, content to be set in deployment.
 //
 @import "tail";
+
+.modal-footer form{
+  margin: 0;
+}
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
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index 3ed8835..268c7d3 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -1,4 +1,48 @@
 - @show_navigation = false
 
 = search :users
-= table @users, %w(username, created, updated)
+%table.table.table-striped.table-bordered
+  %thead
+    %tr
+      %th
+        = t(:username)
+      %th
+        = t(:created)
+      %th
+        = t(:updated)
+      %th
+        = t("actions.toggle_user")
+  %tbody
+    - @users.each do |user|
+      %tr
+        %td
+          = link_to user.username, user
+        %td
+          = user.created_at.strftime("%d %b, %Y, %H:%M")
+        %td
+          = user.updated_at.strftime("%d %b, %Y, %H:%M")
+        %td
+          - if user.enabled
+            %button.btn.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
+              = t("actions.disable_user")
+            .modal.fade.hide{:id => "user-form-#{user.id}"}
+              .modal-dialog
+                .modal-content
+                  .modal-header
+                    %button.close{:"data-dismiss" => "modal"} ×
+                    = t("actions.confirm_user_deactivation", username: user.username)
+                  .modal-footer
+                    = form_tag deactivate_user_path(user) do
+                      %input.btn.btn-default.btn-danger{:type => "submit", :value => "#{t("actions.disable_user")}"}
+          - else
+            %button.btn.btn-default{:"data-toggle" => "modal", :"data-target" => "#user-form-#{user.id}", :type => "button"}
+              = t("actions.enable_user")
+            .modal.fade.hide{:id => "user-form-#{user.id}"}
+              .modal-dialog
+                .modal-content
+                  .modal-header
+                    %button.close{:"data-dismiss" => "modal"} ×
+                    = t("actions.confirm_user_activation", username: user.username)
+                  .modal-footer
+                    = form_tag enable_user_path(user) do
+                      %input.btn.btn-default.btn-danger{:type => "submit", :value => "#{t("actions.enable_user")}"}