about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-08-31 11:55:27 +0200
committerGitHub <noreply@github.com>2022-08-31 11:55:27 +0200
commit0fece174f6fd4dcdf53974889a1fe5618fb34bf3 (patch)
tree1af432657ccf407e0808cac4408f8298e26a7ead
parent0495302f1ca811e5ed48ed49b2d291fc119e9dc6 (diff)
Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)
I failed to account for glitch-soc's theming system when merging
from upstream.
-rw-r--r--app/controllers/filters/statuses_controller.rb5
-rw-r--r--app/views/filters/statuses/index.html.haml3
2 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/filters/statuses_controller.rb b/app/controllers/filters/statuses_controller.rb
index cc493c22c..4f63de7b6 100644
--- a/app/controllers/filters/statuses_controller.rb
+++ b/app/controllers/filters/statuses_controller.rb
@@ -6,6 +6,7 @@ class Filters::StatusesController < ApplicationController
   before_action :authenticate_user!
   before_action :set_filter
   before_action :set_status_filters
+  before_action :set_pack
   before_action :set_body_classes
 
   PER_PAGE = 20
@@ -25,6 +26,10 @@ class Filters::StatusesController < ApplicationController
 
   private
 
+  def set_pack
+    use_pack 'admin'
+  end
+
   def set_filter
     @filter = current_account.custom_filters.find(params[:filter_id])
   end
diff --git a/app/views/filters/statuses/index.html.haml b/app/views/filters/statuses/index.html.haml
index 886de58fa..eaa39e170 100644
--- a/app/views/filters/statuses/index.html.haml
+++ b/app/views/filters/statuses/index.html.haml
@@ -1,6 +1,3 @@
-- content_for :header_tags do
-  = javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
-
 - content_for :page_title do
   = t('filters.statuses.index.title')
   \-