]> cat aescling's git repositories - mastodon.git/commitdiff
Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)
authorClaire <claire.github-309c@sitedethib.com>
Wed, 31 Aug 2022 09:55:27 +0000 (11:55 +0200)
committeraescling <aescling+gitlab@cat.family>
Mon, 5 Sep 2022 04:28:03 +0000 (00:28 -0400)
I failed to account for glitch-soc's theming system when merging
from upstream.

app/controllers/filters/statuses_controller.rb
app/views/filters/statuses/index.html.haml

index cc493c22c641057bb1442a33466d45e968bca09d..4f63de7b6983d5d78ca213d060824c6af64b705a 100644 (file)
@@ -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
index 886de58fa06c0d2194546dcf9caa4875dbb704a7..eaa39e170ff51d90193ca1e502df0f029f0fe3b3 100644 (file)
@@ -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')
   \-