Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide domain for local emojis in admin (#37080)

Browse Source
This commit is contained in:
Echo
2025-12-01 15:24:24 +01:00
committed by GitHub
parent f5d6f60ca7
commit 048746e56b
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/admin/custom_emojis_controller.rb
View File

@@ -5,6 +5,15 @@ module Admin
def index
authorize :custom_emoji, :index?
# If filtering by local emojis, remove by_domain filter.
params.delete(:by_domain) if params[:local].present?
# If filtering by domain, ensure remote filter is set.
if params[:by_domain].present?
params.delete(:local)
params[:remote] = '1'
end
@custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page])
@form = Form::CustomEmojiBatch.new
end

8
app/views/admin/custom_emojis/index.html.haml
View File

@@ -9,15 +9,15 @@
.filter-subset
%strong= t('admin.accounts.location.title')
%ul
%li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil
%li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil, by_domain: nil
%li
- if selected? local: '1', remote: nil
= filter_link_to t('admin.accounts.location.local'), { local: nil, remote: nil }, { local: '1', remote: nil }
- else
= filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil
= filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil, by_domain: nil
%li
- if selected? remote: '1', local: nil
= filter_link_to t('admin.accounts.location.remote'), { remote: nil, local: nil }, { remote: '1', local: nil }
= filter_link_to t('admin.accounts.location.remote'), { remote: nil, local: nil, by_domain: nil }, { remote: '1', local: nil }
- else
= filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
@@ -27,6 +27,8 @@
= form.hidden_field key, value: params[key] if params[key].present?
- %i(shortcode by_domain).each do |key|
- next if key == :by_domain && params[:local] == '1'
.input.string.optional
= form.text_field key,
value: params[key],