Skip to content

AO3-7472 Hide hidden work titles in the related work notes #5817

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 5 commits into
base: master
Choose a base branch
from
Open

AO3-7472 Hide hidden work titles in the related work notes #5817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea17e7a
AO3-7472 hide hidden work titles on work pages and in downloads
slavalamp May 15, 2026
333e6d3
AO3-7472 rename the i18n key
slavalamp May 15, 2026
ed85295
AO3-7472 a test to make sure downloads update
slavalamp May 16, 2026
06d2bb3
AO3-7472 use the preferred logout step name (+replace it in the whole…
slavalamp May 16, 2026
49467f5
AO3-7472 and same for work_related.feature
slavalamp May 16, 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
5 changes: 5 additions & 0 deletions app/helpers/works_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ def related_work_note(related_work, relation, download: false)
language: language,
locale: default_locale,
creator_link: creator_link)
elsif related_work.respond_to?(:hidden_by_admin?) && related_work.hidden_by_admin?
t(".#{relation}.hidden_html",
language: language,
locale: default_locale,
creator_link: creator_link)
else
t(".#{relation}.revealed_html",
language: language,
Expand Down
1 change: 1 addition & 0 deletions app/views/downloads/_download_afterword.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</div>
<% end %>

<%# i18n-tasks-use t("downloads.download_afterword.inspired_by.hidden_html") %>
<%# i18n-tasks-use t("downloads.download_afterword.inspired_by.restricted_html") %>
<%# i18n-tasks-use t("downloads.download_afterword.inspired_by.revealed_html") %>
<%# i18n-tasks-use t("downloads.download_afterword.inspired_by.unrevealed") %>
Expand Down
3 changes: 3 additions & 0 deletions app/views/downloads/_download_preface.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,15 @@
<% end %>
<% end %>

<%# i18n-tasks-use t("downloads.download_preface.translated_to.hidden_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translated_to.restricted_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translated_to.revealed_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translated_to.unrevealed_html") %>
<%# i18n-tasks-use t("downloads.download_preface.inspired_by.hidden_html") %>
<%# i18n-tasks-use t("downloads.download_preface.inspired_by.restricted_html") %>
<%# i18n-tasks-use t("downloads.download_preface.inspired_by.revealed_html") %>
<%# i18n-tasks-use t("downloads.download_preface.inspired_by.unrevealed") %>
<%# i18n-tasks-use t("downloads.download_preface.translation_of.hidden_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translation_of.restricted_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translation_of.revealed_html") %>
<%# i18n-tasks-use t("downloads.download_preface.translation_of.unrevealed") %>
Expand Down
1 change: 1 addition & 0 deletions app/views/works/_work_approved_children.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<div id="children" class="children module">
<h3 class="heading"><%= t(".inspired_by.title") %>:</h3>
<ul>
<%# i18n-tasks-use t("works.work_approved_children.inspired_by.hidden_html") %>
<%# i18n-tasks-use t("works.work_approved_children.inspired_by.restricted_html") %>
<%# i18n-tasks-use t("works.work_approved_children.inspired_by.revealed_html") %>
<%# i18n-tasks-use t("works.work_approved_children.inspired_by.unrevealed") %>
Expand Down
3 changes: 3 additions & 0 deletions app/views/works/_work_header_notes.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<% end %>

<%# translations %>
<%# i18n-tasks-use t("works.work_header_notes.translated_to.hidden_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translated_to.restricted_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translated_to.revealed_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translated_to.unrevealed_html") %>
Expand All @@ -25,9 +26,11 @@
<% end %>

<%# parent works %>
<%# i18n-tasks-use t("works.work_header_notes.translation_of.hidden_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translation_of.restricted_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translation_of.revealed_html") %>
<%# i18n-tasks-use t("works.work_header_notes.translation_of.unrevealed") %>
<%# i18n-tasks-use t("works.work_header_notes.inspired_by.hidden_html") %>
<%# i18n-tasks-use t("works.work_header_notes.inspired_by.restricted_html") %>
<%# i18n-tasks-use t("works.work_header_notes.inspired_by.revealed_html") %>
<%# i18n-tasks-use t("works.work_header_notes.inspired_by.unrevealed") %>
Expand Down
8 changes: 8 additions & 0 deletions config/locales/views/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ en:
comment: drop by the Archive and comment
end_notes: End Notes
inspired_by:
hidden_html: "[Hidden Work] by %{creator_link}"
restricted_html: "[Restricted Work] by %{creator_link}"
revealed_html: "%{work_link} by %{creator_link}"
title: Works inspired by this one
Expand All @@ -960,6 +961,7 @@ en:
end_notes_with_work_notes: more notes
end_notes_without_work_notes: notes
inspired_by:
hidden_html: Inspired by [Hidden Work] by %{creator_link}
restricted_html: Inspired by [Restricted Work] by %{creator_link}
revealed_html: Inspired by %{work_link} by %{creator_link}
unrevealed: Inspired by a work in an unrevealed collection
Expand All @@ -975,10 +977,12 @@ en:
summary: Summary
tag_type: "%{tag_type}:"
translated_to:
hidden_html: 'Translation into %{language} available: [Hidden Work] by %{creator_link}'
restricted_html: 'Translation into %{language} available: [Restricted Work] by %{creator_link}'
revealed_html: 'Translation into %{language} available: %{work_link} by %{creator_link}'
unrevealed_html: 'Translation into %{language} available: A work in an unrevealed collection'
translation_of:
hidden_html: A translation of [Hidden Work] by %{creator_link}
restricted_html: A translation of [Restricted Work] by %{creator_link}
revealed_html: A translation of %{work_link} by %{creator_link}
unrevealed: A translation of a work in an unrevealed collection
Expand Down Expand Up @@ -3327,6 +3331,7 @@ en:
works_translation_link_help_title: Translation link
work_approved_children:
inspired_by:
hidden_html: "[Hidden Work] by %{creator_link}"
restricted_html: "[Restricted Work] by %{creator_link} (Log in to access.)"
revealed_html: "%{work_link} by %{creator_link}"
title: Works inspired by this one
Expand All @@ -3348,6 +3353,7 @@ en:
heading: Download
work_header_notes:
inspired_by:
hidden_html: Inspired by [Hidden Work] by %{creator_link}
other_works_inspired_by_this_one: other works inspired by this one
restricted_html: Inspired by [Restricted Work] by %{creator_link} (Log in to access.)
revealed_html: Inspired by %{work_link} by %{creator_link}
Expand All @@ -3359,10 +3365,12 @@ en:
notes: notes
related_works_html: "(See the end of the work for %{related_works_link}.)"
translated_to:
hidden_html: 'Translation into %{language} available: [Hidden Work] by %{creator_link}'
restricted_html: 'Translation into %{language} available: [Restricted Work] by %{creator_link} (Log in to access.)'
revealed_html: 'Translation into %{language} available: %{work_link} by %{creator_link}'
unrevealed_html: 'Translation into %{language} available: A work in an unrevealed collection'
translation_of:
hidden_html: A translation of [Hidden Work] by %{creator_link}
restricted_html: A translation of [Restricted Work] by %{creator_link} (Log in to access.)
revealed_html: A translation of %{work_link} by %{creator_link}
unrevealed: A translation of a work in an unrevealed collection
Expand Down
60 changes: 57 additions & 3 deletions features/works/work_download.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,15 @@ Feature: Download a work
And a related work has been posted and approved
And I am logged in as "remixer"
And I lock the work "Followup"
When I am logged out
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "[Restricted Work] by remixer"
When I am logged in as "inspiration"
And I lock the work "Worldbuilding"
And I am logged in as "remixer"
And I unlock the work "Followup"
And I am logged out
And I log out
And I view the work "Followup"
And I follow "HTML"
Then I should see "Inspired by [Restricted Work] by inspiration"
Expand Down Expand Up @@ -431,11 +431,65 @@ Feature: Download a work
And a translation has been posted and approved
And I am logged in as "translator"
And I lock the work "Worldbuilding Translated"
When I am logged out
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "[Restricted Work] by translator"

Scenario: Hidden inspired and inspiring works' titles should be hidden in downloads
Given I have related works setup
And a related work has been posted and approved
When I am logged in as a "policy_and_abuse" admin
And I hide the work "Followup"
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "[Hidden Work] by remixer"
When I am logged in as a "policy_and_abuse" admin
And I unhide the work "Followup"
And I hide the work "Worldbuilding"
When I log out
And I view the work "Followup"
And I follow "HTML"
Then I should see "[Hidden Work] by inspiration"

Scenario: Hidden translations and translated works' titles should be hidden in downloads
Given I have related works setup
And a translation has been posted and approved
When I am logged in as a "policy_and_abuse" admin
And I hide the work "Worldbuilding Translated"
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "[Hidden Work] by translator"
When I am logged in as a "policy_and_abuse" admin
And I unhide the work "Worldbuilding Translated"
And I hide the work "Worldbuilding"
When I log out
And I view the work "Worldbuilding Translated"
And I follow "HTML"
Then I should see "[Hidden Work] by inspiration"

Scenario: Downloads should update when works get hidden and unhidden
Given I have related works setup
And a related work has been posted and approved
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "Followup by remixer"
When I am logged in as a "policy_and_abuse" admin
And I hide the work "Followup"
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "[Hidden Work] by remixer"
When I am logged in as a "policy_and_abuse" admin
And I unhide the work "Followup"
When I log out
And I view the work "Worldbuilding"
And I follow "HTML"
Then I should see "Followup by remixer"

Scenario: Download multi-chapter work with mixed chapter titles (one without, one with)

Given I am logged in as "myname"
Expand Down
38 changes: 34 additions & 4 deletions features/works/work_related.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,17 +335,17 @@ Scenario: Restricted works listed as Inspiration show up [Restricted] for guests
And a related work has been posted and approved
When I am logged in as "remixer"
And I lock the work "Followup"
When I am logged out
When I log out
And I view the work "Worldbuilding"
Then I should see "[Restricted Work] by remixer"
When I am logged in as "remixer"
And I unlock the work "Followup"
When I am logged out
When I log out
And I view the work "Followup"
Then I should see "Inspired by Worldbuilding by inspiration"
When I am logged in as "inspiration"
And I lock the work "Worldbuilding"
When I am logged out
When I log out
And I view the work "Followup"
Then I should see "Inspired by [Restricted Work] by inspiration"

Expand All @@ -368,11 +368,41 @@ Scenario: Anonymous works listed as inspiration should have links to the authors
When I follow "remixer" within ".afterword .children"
Then I should be on the dashboard page for user "remixer" with pseud "remixer"

When I am logged out
When I log out
And I view the work "Worldbuilding"
Then I should see "Works inspired by this one: Followup by Anonymous"
And I should not see "remixer" within ".afterword .children"

Scenario: Hidden inspired and inspiring works should show up as [Hidden]
Given I have related works setup
And a related work has been posted and approved
When I am logged in as a "policy_and_abuse" admin
And I hide the work "Followup"
When I log out
And I view the work "Worldbuilding"
Then I should see "[Hidden Work] by remixer"
When I am logged in as a "policy_and_abuse" admin
And I unhide the work "Followup"
And I hide the work "Worldbuilding"
When I log out
And I view the work "Followup"
Then I should see "[Hidden Work] by inspiration"

Scenario: Hidden translations and translated works should show up as [Hidden]
Given I have related works setup
And a translation has been posted and approved
When I am logged in as a "policy_and_abuse" admin
And I hide the work "Worldbuilding Translated"
When I log out
And I view the work "Worldbuilding"
Then I should see "[Hidden Work] by translator"
When I am logged in as a "policy_and_abuse" admin
And I unhide the work "Worldbuilding Translated"
And I hide the work "Worldbuilding"
When I log out
And I view the work "Worldbuilding Translated"
Then I should see "[Hidden Work] by inspiration"

Scenario: When a user is notified that a co-authored work has been inspired by a work they posted,
the e-mail should link to each author's URL instead of showing escaped HTML
Given I have related works setup
Expand Down
Loading