Skip to content

AO3-6779 Log work tag and language edits by admins correctly #5532

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.

Sign up for GitHub

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

Open
slavalamp wants to merge 10 commits into
base: master
Choose a base branch
from
+80 −9
Open

AO3-6779 Log work tag and language edits by admins correctly #5532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f3afe9f
AO3-6779 log language edits by admins as language edits
slavalamp Jan 2, 2026
9b2dae1
AO3-6779 log both tag and language edits if both happened, don't log …
slavalamp Jan 5, 2026
315b392
Revert previous commit
slavalamp Jan 5, 2026
c3da8e7
AO3-6779 log both tag and language edits if both happened, don't log …
slavalamp Jan 5, 2026
f7093f9
AO3-6779 handle empty languages better
slavalamp Jan 5, 2026
07fc60c
AO3-6779 improve the category/warning change check part
slavalamp Jan 5, 2026
56a9c61
AO3-6779 update the admin_activity_summary comment
slavalamp Jan 5, 2026
14f50b5
AO3-6779 remove the extra test that i didn't mean to add oops
slavalamp Jan 6, 2026
6d6fe70
AO3-6779 added a test for previewing-then-posting with no changes
slavalamp Jan 6, 2026
21b6cd7
AO3-6779 clearer test scenario description
slavalamp Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions app/controllers/works_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,15 +820,47 @@ def index_page_title
end

def log_admin_activity
if logged_in_as_admin?
options = { action: params[:action] }
return unless logged_in_as_admin?

if params[:action] == 'update_tags'
summary = "Old tags: #{@work.tags.pluck(:name).join(', ')}"
if params[:action] == "update_tags"
Copy link
Contributor Author

@slavalamp slavalamp Jan 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

fixed code style for the whole method (swapped a giant if condition for a return unless and removed an unused variable assignment) because it was small and i'm adding a lot to it anyway :")

this if condition also isn't needed right now since this is only executed for the "update_tags" action anyway, but i'm not sure this method isn't planned to be used for something else, so keeping it just in case

unless params[:work][:language_id].empty?
old_language_id = @work.language_id
new_language_id = params[:work][:language_id].to_i

if old_language_id != new_language_id
new_language_name = Language.find_by(id: new_language_id).name
edit_language_summary = "<p>Old language: #{@work.language.name}</p><p>New language: #{new_language_name}</p>"

AdminActivity.log_action(current_admin, @work, action: "edit language", summary: edit_language_summary)
end
end

# Don't log if nothing changed.
rating_changed = params[:work][:rating_string] != @work.rating_string
fandoms_changed = params[:work][:fandom_string] != @work.fandom_string
relationships_changed = params[:work][:relationship_string] != @work.relationship_string
characters_changed = params[:work][:character_string] != @work.character_string
freeforms_changed = params[:work][:freeform_string] != @work.freeform_string
# Saving without previewing uses "strings" category and warning parameters
# but previewing and saving uses "string" ones
if params[:work][:category_strings].nil?
categories_changed = params[:work][:category_string] != @work.category_string
warnings_changed = params[:work][:archive_warning_string] != @work.archive_warning_string
else
# The category_strings and archive_warning_strings params values
# both start with an empty element which has to be dropped here
categories_changed = params[:work][:category_strings].drop(1).sort != @work.category_strings.sort
warnings_changed = params[:work][:archive_warning_strings].drop(1).sort != @work.archive_warning_strings.sort
end

AdminActivity.log_action(current_admin, @work, action: params[:action], summary: summary)
return unless rating_changed || fandoms_changed || relationships_changed ||
characters_changed || freeforms_changed ||
categories_changed || warnings_changed

summary = "Old tags: #{@work.tags.pluck(:name).join(', ')}"
end

AdminActivity.log_action(current_admin, @work, action: params[:action], summary: summary)
end

private
Expand Down
8 changes: 4 additions & 4 deletions app/helpers/admin_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ def admin_activity_target_link(activity)
link_to(activity.target_name, url)
end

# Summaries for profile and pseud edits, which contain links, need to be
# handled differently from summaries that use item.inspect (and thus contain
# angle brackets).
# Summaries for profile and pseud edits, which contain links, and summaries for
# language edits, which have multiple paragraphs, need to be handled differently
# from summaries that use item.inspect (and thus contain angle brackets).
def admin_activity_summary(activity)
if activity.action == "edit pseud" || activity.action == "edit profile"
if activity.action == "edit pseud" || activity.action == "edit profile" || activity.action == "edit language"
raw sanitize_field(activity, :summary)
else
activity.summary
Expand Down
39 changes: 39 additions & 0 deletions features/admins/admin_works.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,11 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
And I press "Update"
Then I should see "Deutsch"
And I should not see "English"
When I follow "Activities"
Then I should see "edit language"
When I visit the last activities item
Then I should see "Old language: English"
And I should see "New language: Deutsch"

Scenario: Admin can edit language on works when previewing first
Given basic languages
Expand All @@ -395,6 +400,40 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks
Then I should see "Deutsch"
And I should not see "English"

Scenario: When admin edits tags and language on works at the same time, both Activities entries are added
Given basic languages
And the work "Wrong Tags and Language"
When I am logged in as a "policy_and_abuse" admin
And I view the work "Wrong Tags and Language"
And I follow "Edit Tags and Language"
When I select "Mature" from "Rating"
And I select "Deutsch" from "Choose a language"
And I press "Update"
And I follow "Activities"
Then I should see "update_tags"
And I should see "edit language"

Scenario: When admin does not edit tags or language and posts without previewing, no Activities entries are added
Given the work "Nothing Wrong"
When I am logged in as a "policy_and_abuse" admin
And I view the work "Nothing Wrong"
And I follow "Edit Tags and Language"
And I press "Update"
And I follow "Activities"
Then I should not see "update_tags"
And I should not see "edit language"

Scenario: When admin does not edit tags or language, previews and then posts, no Activities entries are added
Given the work "Nothing Wrong"
When I am logged in as a "policy_and_abuse" admin
And I view the work "Nothing Wrong"
And I follow "Edit Tags and Language"
And I press "Preview"
And I press "Update"
And I follow "Activities"
Then I should not see "update_tags"
And I should not see "edit language"

Scenario: can mark a work as spam
Given the work "Spammity Spam"
And I am logged in as a "policy_and_abuse" admin
Expand Down
Loading