Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve admin page #4121

Merged
merged 4 commits into from Jul 18, 2017
Merged

Improve admin page #4121

merged 4 commits into from Jul 18, 2017

Conversation

abcang
Copy link
Contributor

@abcang abcang commented Jul 8, 2017

  • Improve report page.
    • Add batch action (change NSFW or delete status),
    • Added function to show and hide all media.
    • Changed to delete status asynchronously.
  • Add account status page.
    • Delete status and change NSFW possible.
    • There is a filter to narrow down the media.

Report page:
image

Account status page:
image

Account page:
image

ykzts
ykzts previously requested changes Jul 9, 2017
@form = Form::StatusBatch.new(form_status_batch_params)
unless @form.save
flash[:alert] = t('admin.statuses.failed_to_execute')
end
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flash[:alert] = t('admin.statuses.failed_to_execute') unless @form.save

flash[:alert] = t('admin.statuses.failed_to_execute')
end
redirect_to admin_account_statuses_path(@account.id, current_params)
end
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flash[:alert] = t('admin.statuses.failed_to_execute') unless @form.save

@@ -15,7 +23,7 @@ def update
def destroy
authorize @status, :destroy?
RemovalWorker.perform_async(@status.id)
redirect_to admin_report_path(@report)
render json: @status
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ykzts ykzts dismissed their stale review July 9, 2017 07:40

fix ruby syntax

@abcang
Copy link
Contributor Author

abcang commented Jul 9, 2017

I Improved select style

Copy link
Contributor

@beatrix-bitrot beatrix-bitrot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work!! LGTM

@akihikodaki akihikodaki added moderation Administration and moderation tooling enhancement labels Jul 11, 2017
batch:
delete: Delete
nsfw_off: NSFW OFF
nsfw_on: NSFW ON
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NSFW? Isn't it now called 'Content warning' on Mastodon?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Content warning" is a function to hide sentences, and NSFW is a function to hide images. The implemented function is a function to change NSFW.

@Gargron Gargron merged commit 4d42a38 into mastodon:master Jul 18, 2017
@abcang abcang deleted the improve_admin_page branch July 18, 2017 14:40
abcang added a commit to pixiv/mastodon that referenced this pull request Jul 24, 2017
* Improve admin page

* Fix test

* Add spec

* Improve select style
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
moderation Administration and moderation tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants