diff --git a/app/controllers/admin/disputes/strikes_controller.rb b/app/controllers/admin/disputes/strikes_controller.rb new file mode 100644 index 00000000000..e57c713564f --- /dev/null +++ b/app/controllers/admin/disputes/strikes_controller.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Admin::Disputes::StrikesController < Disputes::StrikesController +end diff --git a/app/controllers/disputes/appeals_controller.rb b/app/controllers/disputes/appeals_controller.rb index 797f31cf782..00034e1ab2d 100644 --- a/app/controllers/disputes/appeals_controller.rb +++ b/app/controllers/disputes/appeals_controller.rb @@ -8,7 +8,7 @@ class Disputes::AppealsController < Disputes::BaseController @appeal = AppealService.new.call(@strike, appeal_params[:text]) - redirect_to disputes_strike_path(@strike), notice: I18n.t('disputes.strikes.appealed_msg') + redirect_to admin_disputes_strike_path(@strike), notice: I18n.t('disputes.strikes.appealed_msg') rescue ActiveRecord::RecordInvalid => e @appeal = e.record render 'disputes/strikes/show' diff --git a/app/views/admin/disputes/appeals/_appeal.html.haml b/app/views/admin/disputes/appeals/_appeal.html.haml index d5611211ed1..110d6cc4a10 100644 --- a/app/views/admin/disputes/appeals/_appeal.html.haml +++ b/app/views/admin/disputes/appeals/_appeal.html.haml @@ -1,4 +1,4 @@ -= link_to disputes_strike_path(appeal.strike), class: ['log-entry', appeal.approved? && 'log-entry--inactive'] do += link_to admin_disputes_strike_path(appeal.strike), class: ['log-entry', appeal.approved? && 'log-entry--inactive'] do .log-entry__header .log-entry__avatar = image_tag appeal.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar' diff --git a/config/navigation.rb b/config/navigation.rb index 9ace5d5158b..7e0103729d2 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -53,7 +53,7 @@ SimpleNavigation::Configuration.run do |navigation| n.item :moderation, safe_join([material_symbol('gavel'), t('moderation.title')]), nil, if: -> { current_user.can?(:manage_reports, :view_audit_log, :manage_users, :manage_invites, :manage_taxonomies, :manage_federation, :manage_blocks) && !self_destruct } do |s| s.item :reports, safe_join([material_symbol('flag'), t('admin.reports.title')]), admin_reports_path, highlights_on: %r{/admin/reports|admin/report_notes}, if: -> { current_user.can?(:manage_reports) } - s.item :appeals, safe_join([material_symbol('feedback'), t('admin.disputes.appeals.title')]), admin_disputes_appeals_path, highlights_on: %r{/admin/disputes/appeals}, if: -> { current_user.can?(:manage_appeals) } + s.item :appeals, safe_join([material_symbol('feedback'), t('admin.disputes.appeals.title')]), admin_disputes_appeals_path, highlights_on: %r{/admin/disputes/}, if: -> { current_user.can?(:manage_appeals) } s.item :accounts, safe_join([material_symbol('groups'), t('admin.accounts.title')]), admin_accounts_path(origin: 'local'), highlights_on: %r{/admin/accounts|admin/account_moderation_notes|/admin/pending_accounts|/admin/users}, if: -> { current_user.can?(:manage_users) } s.item :tags, safe_join([material_symbol('tag'), t('admin.tags.title')]), admin_tags_path, highlights_on: %r{/admin/tags}, if: -> { current_user.can?(:manage_taxonomies) } s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) } diff --git a/config/routes/admin.rb b/config/routes/admin.rb index ee2ec7c4664..bb0c6f33a23 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -205,6 +205,8 @@ namespace :admin do end namespace :disputes do + resources :strikes, only: [:show, :index] + resources :appeals, only: [:index] do member do post :approve