diff --git a/app/helpers/admin/users_helper.rb b/app/helpers/admin/users_helper.rb index 13914597e..4c9deb80f 100644 --- a/app/helpers/admin/users_helper.rb +++ b/app/helpers/admin/users_helper.rb @@ -48,6 +48,8 @@ module Admin def user_status(user) if user.suspended? I18n.t("views.admin.users.statuses.Suspended") + elsif user.spam? + I18n.t("views.admin.users.statuses.Spam") elsif user.warned? I18n.t("views.admin.users.statuses.Warned") elsif user.comment_suspended? @@ -97,7 +99,7 @@ module Admin # Returns a string hex code representing the indicator color for the given status (also known as BASE_ROLE) def status_to_indicator_color(status) case status - when "Suspended" + when "Suspended", "Spam" "#DC2626" when "Warned" "#F59E0B" diff --git a/app/views/admin/users/index/_user_status_indicator.html.erb b/app/views/admin/users/index/_user_status_indicator.html.erb index f7f5a22a9..5176a1822 100644 --- a/app/views/admin/users/index/_user_status_indicator.html.erb +++ b/app/views/admin/users/index/_user_status_indicator.html.erb @@ -1,5 +1,7 @@ <% if user.suspended? %> <%= render "admin/users/index/status_indicator", status: "Suspended" %> +<% elsif user.spam? %> + <%= render "admin/users/index/status_indicator", status: "Spam" %> <% elsif user.warned? %> <%= render "admin/users/index/status_indicator", status: "Warned" %> <% elsif user.comment_suspended? %> diff --git a/spec/helpers/admin/users_helper_spec.rb b/spec/helpers/admin/users_helper_spec.rb index 9c29dab0b..346017352 100644 --- a/spec/helpers/admin/users_helper_spec.rb +++ b/spec/helpers/admin/users_helper_spec.rb @@ -121,6 +121,12 @@ describe Admin::UsersHelper do expect(status).to eq "Suspended" end + it "renders the proper status for a user that is spam" do + spam_user = create(:user, :spam) + status = helper.user_status(spam_user) + expect(status).to eq "Spam" + end + it "renders the proper status for a user that is warned" do warned_user = create(:user, :warned) status = helper.user_status(warned_user)