From 9c350b60e87a58e4fcf748fe3c9bc1baa5c04655 Mon Sep 17 00:00:00 2001 From: Evelyn Date: Sun, 20 Sep 2015 13:53:53 -0500 Subject: adding ability to disable/enable users by admin --- app/assets/stylesheets/application.scss | 4 +++ app/controllers/sessions_controller.rb | 9 +++++++ app/controllers/users_controller.rb | 6 +++-- app/views/users/index.html.haml | 46 ++++++++++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 3 deletions(-) (limited to 'app') 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")}"} -- cgit v1.2.3 From 5da852740580ba0e48dbab04c43750de843bf131 Mon Sep 17 00:00:00 2001 From: EvyW Date: Tue, 22 Sep 2015 15:27:13 -0500 Subject: Update leap.scss --- app/assets/stylesheets/leap.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app') diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss index dddcc1a..9fe2195 100644 --- a/app/assets/stylesheets/leap.scss +++ b/app/assets/stylesheets/leap.scss @@ -307,3 +307,6 @@ html, body { margin: 0 2px; } } +.modal-footer form{ + margin: 0; +} -- cgit v1.2.3 From 0af541e20e4343d20dd89cb73ef1d2f01f5c55f6 Mon Sep 17 00:00:00 2001 From: EvyW Date: Tue, 22 Sep 2015 15:39:29 -0500 Subject: commit user haml --- app/views/users/_user.html.haml | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index 583d22f..2d2f262 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -1,4 +1,32 @@ -%tr - %td= link_to user.login, user - %td= l(user.created_at, :format => :short) - %td= l(user.updated_at, :format => :short) + %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")}"} -- cgit v1.2.3 From 75338e097c964b4287cff7de9e142244f3681a14 Mon Sep 17 00:00:00 2001 From: EvyW Date: Tue, 22 Sep 2015 15:46:48 -0500 Subject: index changes --- app/views/users/index.html.haml | 47 ++--------------------------------------- 1 file changed, 2 insertions(+), 45 deletions(-) (limited to 'app') diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml index 268c7d3..e1136d8 100644 --- a/app/views/users/index.html.haml +++ b/app/views/users/index.html.haml @@ -1,48 +1,5 @@ - @show_navigation = false = search :users -%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")}"} += table @users, %w(username, created, updated, actions.toggle_user) + -- cgit v1.2.3 From 9616fb4386729cd65612af1c90b2f19369482b01 Mon Sep 17 00:00:00 2001 From: EvyW Date: Mon, 28 Sep 2015 10:26:07 -0500 Subject: changes style sheets removed the three last lines --- app/assets/stylesheets/application.scss | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index bb40129..9cd3a55 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -26,7 +26,3 @@ // import custom scss, content to be set in deployment. // @import "tail"; - -.modal-footer form{ - margin: 0; -} -- cgit v1.2.3 From 289424bda4cabfa682e07059bfdc1a0c7f04c1ef Mon Sep 17 00:00:00 2001 From: EvyW Date: Mon, 28 Sep 2015 16:41:04 -0500 Subject: with out identing --- app/views/users/_user.html.haml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index 2d2f262..c215a91 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -1,10 +1,7 @@ %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= 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"} -- cgit v1.2.3 From df62d292f5df6dffd8a0e621181632f276c0b304 Mon Sep 17 00:00:00 2001 From: EvyW Date: Thu, 1 Oct 2015 15:12:59 -0500 Subject: Identing first line --- app/views/users/_user.html.haml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index c215a91..9deb596 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -1,7 +1,10 @@ - %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") +%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"} -- cgit v1.2.3 From 02c1e607bf8beb1f576307a7ad87f0cdbe3381c0 Mon Sep 17 00:00:00 2001 From: EvyW Date: Thu, 1 Oct 2015 17:15:35 -0500 Subject: identing 2 --- app/views/users/_user.html.haml | 62 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'app') diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index 9deb596..1cabcf5 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -1,32 +1,32 @@ %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")}"} + %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")}"} -- cgit v1.2.3