Hide domain for local emojis in admin (#37080)
This commit is contained in:
parent
f5d6f60ca7
commit
048746e56b
@ -5,6 +5,15 @@ module Admin
|
|||||||
def index
|
def index
|
||||||
authorize :custom_emoji, :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])
|
@custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page])
|
||||||
@form = Form::CustomEmojiBatch.new
|
@form = Form::CustomEmojiBatch.new
|
||||||
end
|
end
|
||||||
|
|||||||
@ -9,15 +9,15 @@
|
|||||||
.filter-subset
|
.filter-subset
|
||||||
%strong= t('admin.accounts.location.title')
|
%strong= t('admin.accounts.location.title')
|
||||||
%ul
|
%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
|
%li
|
||||||
- if selected? local: '1', remote: nil
|
- if selected? local: '1', remote: nil
|
||||||
= filter_link_to t('admin.accounts.location.local'), { local: nil, remote: nil }, { local: '1', remote: nil }
|
= filter_link_to t('admin.accounts.location.local'), { local: nil, remote: nil }, { local: '1', remote: nil }
|
||||||
- else
|
- 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
|
%li
|
||||||
- if selected? remote: '1', local: nil
|
- 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
|
- else
|
||||||
= filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
|
= 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?
|
= form.hidden_field key, value: params[key] if params[key].present?
|
||||||
|
|
||||||
- %i(shortcode by_domain).each do |key|
|
- %i(shortcode by_domain).each do |key|
|
||||||
|
- next if key == :by_domain && params[:local] == '1'
|
||||||
|
|
||||||
.input.string.optional
|
.input.string.optional
|
||||||
= form.text_field key,
|
= form.text_field key,
|
||||||
value: params[key],
|
value: params[key],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user