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

Fix batch actions on non-pending tags in admin interface (#12537) 

- Allow batch actions on unreviewed tags
- Hide checkboxes when batch actions aren't available
rebase/4.0.0rc2
ThibG 2019-12-29 05:41:26 +01:00 committed by Eugen Rochko
parent 31f7c3fc5d
commit 162dc845a0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/admin/tags/_tag.html.haml
View File

@ -1,6 +1,7 @@
.batch-table__row .batch-table__row
%label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox - if batch_available
= f.check_box :tag_ids, { multiple: true, include_hidden: false }, tag.id %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
= f.check_box :tag_ids, { multiple: true, include_hidden: false }, tag.id
.directory__tag .directory__tag
= link_to admin_tag_path(tag.id) do = link_to admin_tag_path(tag.id) do

15
app/views/admin/tags/index.html.haml
View File

@ -50,25 +50,26 @@
.batch-table.optional .batch-table.optional
.batch-table__toolbar .batch-table__toolbar
%label.batch-table__toolbar__select.batch-checkbox-all - if params[:pending_review] == '1' || params[:unreviewed] == '1'
= check_box_tag :batch_checkbox_all, nil, false %label.batch-table__toolbar__select.batch-checkbox-all
.batch-table__toolbar__actions = check_box_tag :batch_checkbox_all, nil, false
- if params[:pending_review] == '1' .batch-table__toolbar__actions
= f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } = f.button safe_join([fa_icon('check'), t('admin.accounts.approve')]), name: :approve, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
= f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') } = f.button safe_join([fa_icon('times'), t('admin.accounts.reject')]), name: :reject, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
- else - else
.batch-table__toolbar__actions
%span.neutral-hint= t('generic.no_batch_actions_available') %span.neutral-hint= t('generic.no_batch_actions_available')
.batch-table__body .batch-table__body
- if @tags.empty? - if @tags.empty?
= nothing_here 'nothing-here--under-tabs' = nothing_here 'nothing-here--under-tabs'
- else - else
= render partial: 'tag', collection: @tags, locals: { f: f } = render partial: 'tag', collection: @tags, locals: { f: f, batch_available: params[:pending_review] == '1' || params[:unreviewed] == '1' }
= paginate @tags = paginate @tags
- if params[:pending_review] == '1' - if params[:pending_review] == '1' || params[:unreviewed] == '1'
%hr.spacer/ %hr.spacer/
%div{ style: 'overflow: hidden' } %div{ style: 'overflow: hidden' }