diff --git a/app/controllers/internal/mods_controller.rb b/app/controllers/internal/mods_controller.rb index 6f433aade..05cc921a1 100644 --- a/app/controllers/internal/mods_controller.rb +++ b/app/controllers/internal/mods_controller.rb @@ -3,11 +3,11 @@ class Internal::ModsController < Internal::ApplicationController def index @mods = if params[:state] == "tag" - User.with_role(:tag_moderator, :any).page(params[:page]).per(50) + User.with_role(:tag_moderator, :any).page(params[:page]).per(50).includes(:notes) elsif params[:state] == "potential" - User.order("comments_count DESC").page(params[:page]).per(100) + User.order("comments_count DESC").page(params[:page]).per(100).includes(:notes) else - User.with_role(:trusted).page(params[:page]).per(50) + User.with_role(:trusted).page(params[:page]).per(50).includes(:notes) end @mods = @mods.where("users.username ILIKE :search OR users.name ILIKE :search", search: "%#{params[:search]}%") if params[:search].present? end diff --git a/app/labor/assign_tag_moderator.rb b/app/labor/assign_tag_moderator.rb index b27efb3e0..3b8ada559 100644 --- a/app/labor/assign_tag_moderator.rb +++ b/app/labor/assign_tag_moderator.rb @@ -1,6 +1,7 @@ module AssignTagModerator def self.add_trusted_role(user) return if user.has_role?(:trusted) + return if user.has_role?(:banned) user.add_role :trusted user.update(email_community_mod_newsletter: true) diff --git a/app/views/internal/mods/index.html.erb b/app/views/internal/mods/index.html.erb index ece9f92e4..5a4a5f432 100644 --- a/app/views/internal/mods/index.html.erb +++ b/app/views/internal/mods/index.html.erb @@ -23,23 +23,25 @@ <%= paginate @mods %> -