djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-24 00:54:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)

Browse Source 
I failed to account for glitch-soc's theming system when merging
from upstream.
This commit is contained in:
Claire 2022-08-31 11:55:27 +02:00 committed by GitHub
parent 0495302f1c
commit 0fece174f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/filters/statuses_controller.rb
View File

@ -6,6 +6,7 @@ class Filters::StatusesController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :set_filter before_action :set_filter
before_action :set_status_filters before_action :set_status_filters
before_action :set_pack
before_action :set_body_classes before_action :set_body_classes
PER_PAGE = 20 PER_PAGE = 20
@ -25,6 +26,10 @@ class Filters::StatusesController < ApplicationController
private private
def set_pack
use_pack 'admin'
end
def set_filter def set_filter
@filter = current_account.custom_filters.find(params[:filter_id]) @filter = current_account.custom_filters.find(params[:filter_id])
end end

3
app/views/filters/statuses/index.html.haml
View File

@ -1,6 +1,3 @@
- content_for :header_tags do
= javascript_pack_tag 'admin', async: true, crossorigin: 'anonymous'
- content_for :page_title do - content_for :page_title do
= t('filters.statuses.index.title') = t('filters.statuses.index.title')
\- \-