IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 21:27:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Used the term suspended instead of banned.

Browse Source
This commit is contained in:
Neil Lalonde
2013-11-07 13:53:49 -05:00
parent 706f96af0a
commit 0c6f794eb0
57 changed files with 318 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/users_controller.rb
+12 -12
View File
@@ -4,8 +4,8 @@ require_dependency 'boost_trust_level'
class Admin::UsersController < Admin::AdminController
before_filter :fetch_user, only: [:ban,
:unban,
before_filter :fetch_user, only: [:suspend,
:unsuspend,
:refresh_browsers,
:revoke_admin,
:grant_admin,
@@ -37,21 +37,21 @@ class Admin::UsersController < Admin::AdminController
render nothing: true
end
def ban
guardian.ensure_can_ban!(@user)
@user.banned_till = params[:duration].to_i.days.from_now
@user.banned_at = DateTime.now
def suspend
guardian.ensure_can_suspend!(@user)
@user.suspended_till = params[:duration].to_i.days.from_now
@user.suspended_at = DateTime.now
@user.save!
StaffActionLogger.new(current_user).log_user_ban(@user, params[:reason])
StaffActionLogger.new(current_user).log_user_suspend(@user, params[:reason])
render nothing: true
end
def unban
guardian.ensure_can_ban!(@user)
@user.banned_till = nil
@user.banned_at = nil
def unsuspend
guardian.ensure_can_suspend!(@user)
@user.suspended_till = nil
@user.suspended_at = nil
@user.save!
StaffActionLogger.new(current_user).log_user_unban(@user)
StaffActionLogger.new(current_user).log_user_unsuspend(@user)
render nothing: true
end
app/controllers/session_controller.rb
+4 -4
View File
@@ -27,11 +27,11 @@ class SessionController < ApplicationController
# If their password is correct
if @user.confirm_password?(password)
if @user.is_banned?
if reason = @user.ban_reason
render json: { error: I18n.t("login.banned_with_reason", {date: I18n.l(@user.banned_till, format: :date_only), reason: reason}) }
if @user.suspended?
if reason = @user.suspend_reason
render json: { error: I18n.t("login.suspended_with_reason", {date: I18n.l(@user.suspended_till, format: :date_only), reason: reason}) }
else
render json: { error: I18n.t("login.banned", {date: I18n.l(@user.banned_till, format: :date_only)}) }
render json: { error: I18n.t("login.suspended", {date: I18n.l(@user.suspended_till, format: :date_only)}) }
end
return
end