diff --git a/app/controllers/moderator/dashboards_controller.rb b/app/controllers/moderator/dashboards_controller.rb index 06bc255e9..f466542d0 100644 --- a/app/controllers/moderator/dashboards_controller.rb +++ b/app/controllers/moderator/dashboards_controller.rb @@ -4,7 +4,7 @@ module Moderator helper :post_flags, :post_appeals def show - @dashboard = Moderator::Dashboard::Report.new(params[:min_date] || 2.days.ago.to_date, params[:max_level] || 20) + @dashboard = Moderator::Dashboard::Report.new(**search_params.to_h.symbolize_keys) end end end diff --git a/app/helpers/admin/users_helper.rb b/app/helpers/admin/users_helper.rb deleted file mode 100644 index 7f01da02c..000000000 --- a/app/helpers/admin/users_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -module Admin::UsersHelper - def user_level_select(object, field) - options = [ - ["Member", User::Levels::MEMBER], - ["Gold", User::Levels::GOLD], - ["Platinum", User::Levels::PLATINUM], - ["Builder", User::Levels::BUILDER], - ["Moderator", User::Levels::MODERATOR], - ["Admin", User::Levels::ADMIN] - ] - select(object, field, options) - end -end diff --git a/app/helpers/moderator/dashboards_helper.rb b/app/helpers/moderator/dashboards_helper.rb deleted file mode 100644 index b85cfbfef..000000000 --- a/app/helpers/moderator/dashboards_helper.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Moderator - module DashboardsHelper - def user_level_select_tag(name, options = {}) - choices = [ - ["", ""], - ["Member", 20], - ["Gold", 30], - ["Platinum", 31], - ["Moderator", 40], - ["Admin", 50] - ] - - select_tag(name, options_for_select(choices, params[name].to_i), options) - end - end -end diff --git a/app/logical/moderator/dashboard/report.rb b/app/logical/moderator/dashboard/report.rb index 9f1628d08..972fe665f 100644 --- a/app/logical/moderator/dashboard/report.rb +++ b/app/logical/moderator/dashboard/report.rb @@ -3,9 +3,9 @@ module Moderator class Report attr_reader :min_date, :max_level - def initialize(min_date, max_level) - @min_date = min_date.present? ? min_date.to_date : 1.week.ago - @max_level = max_level.present? ? max_level.to_i : User::Levels::MEMBER + def initialize(min_date: 1.week.ago.to_date, max_level: User::Levels::MEMBER) + @min_date = min_date + @max_level = max_level.to_i end def artists diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index d0dfe3a73..6e5ce9595 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -2,35 +2,13 @@