hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix relationships controller/view wrt. glitch-soc theming engine

signup-info-prompt
Thibaut Girka 2019-03-16 14:26:14 +01:00
parent 3960a9d605
commit 8e5d72dba8
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/relationships_controller.rb
View File

@ -5,6 +5,7 @@ class RelationshipsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :set_accounts, only: :show before_action :set_accounts, only: :show
before_action :set_pack
before_action :set_body_classes before_action :set_body_classes
helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship? helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
@ -95,4 +96,8 @@ class RelationshipsController < ApplicationController
def set_body_classes def set_body_classes
@body_classes = 'admin' @body_classes = 'admin'
end end
def set_pack
use_pack 'admin'
end
end end

3
app/views/relationships/show.html.haml
View File

@ -1,9 +1,6 @@
- content_for :page_title do - content_for :page_title do
= t('settings.relationships') = t('settings.relationships')
- content_for :header_tags do
= javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
.filters .filters
.filter-subset .filter-subset
%strong= t 'relationships.relationship' %strong= t 'relationships.relationship'