From 32029f815c7362491114c9a4acbdc3a0261d687b Mon Sep 17 00:00:00 2001 From: ReverM Date: Thu, 8 Jan 2026 22:09:45 -0500 Subject: [PATCH 1/6] Changed the erb to be less confusing (and added some locales) --- .../_assignment_blurb.html.erb | 17 +++++++++++------ config/locales/views/en.yml | 10 ++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/views/challenge_assignments/_assignment_blurb.html.erb b/app/views/challenge_assignments/_assignment_blurb.html.erb index e4d97725f9a..ca0e4d90356 100755 --- a/app/views/challenge_assignments/_assignment_blurb.html.erb +++ b/app/views/challenge_assignments/_assignment_blurb.html.erb @@ -26,21 +26,26 @@
-
<%= ts("Status:") %>
+
<%= t(".stats.status.header") %>
<% # status can be: unposted (no creation), unapproved (creation but it hasn't been approved), complete %> <% if !assignment.posted? %> - <%= ts("Unposted") %> + <%= t(".stats.status.unposted") %> <% elsif !assignment.fulfilled? %> - <%= ts("Unapproved") %> + <%= t(".stats.status.unfullfilled") %> <% else %> - <%= ts("Complete!") %> + <%= t(".stats.status.fullfilled") %> <% end %>
<% if assignment.creation %> -
<%= ts("Posted:") %>
-
<%= assignment.creation.published_at %>
+ <% if assignment.posted? %> +
<%= t(".stats.creation.posted")%>
+
<%= assignment.creation.published_at %>
+ <% else %> +
<%= t(".stats.creation.unposted")%>
+
<%= assignment.creation.created_at %>
+ <% end %> <% if assignment.creation.respond_to?(:word_count) %>
<%= ts("Words:") %>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 7a83d4b3831..6827544fd62 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -569,6 +569,16 @@ en: challenge_requests: fandom: Fandom %{allowed_fandom_count} challenge_assignments: + assignment_blurb: + stats: + creation: + posted: "Posted:" + unposted: "Created:" + status: + fullfilled: "Complete!" + header: "Status:" + unfullfilled: Unapproved + unposted: Unposted to_default: button: Default confirmation: Are you sure? This will mark you as having defaulted and notify the collection maintainer! It cannot be undone. From 9462859869548c5dac8a602e9f84811eac6bb5fd Mon Sep 17 00:00:00 2001 From: ReverM Date: Fri, 9 Jan 2026 15:46:13 -0500 Subject: [PATCH 2/6] Made the title change when draft --- app/views/challenge_assignments/_assignment_blurb.html.erb | 5 ++++- config/locales/views/en.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/challenge_assignments/_assignment_blurb.html.erb b/app/views/challenge_assignments/_assignment_blurb.html.erb index ca0e4d90356..d52115a8b95 100755 --- a/app/views/challenge_assignments/_assignment_blurb.html.erb +++ b/app/views/challenge_assignments/_assignment_blurb.html.erb @@ -12,7 +12,10 @@
<% # link to the work %> <% if assignment.creation %> - <%= link_to (assignment.creation.try(:title) || assignment.creation.class.name), assignment.creation, :class => "work" %> + <%= link_to (assignment.creation.try(:title) || assignment.creation.class.name), assignment.creation, :class => "work" %> + <% if !assignment.posted? %> + <%= t(".draft_header") %> + <% end %> <% end %> <% if @collection && @collection.user_is_maintainer?(current_user) %> diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index 6827544fd62..be32059a9f0 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -570,6 +570,7 @@ en: fandom: Fandom %{allowed_fandom_count} challenge_assignments: assignment_blurb: + draft_header: " (draft)" stats: creation: posted: "Posted:" From 12bf4e209e80067c3ad81417a00b67c45898a856 Mon Sep 17 00:00:00 2001 From: ReverM Date: Mon, 12 Jan 2026 15:27:02 -0500 Subject: [PATCH 3/6] Added test to cover behaviour --- .../challenge_giftexchange.feature | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/features/gift_exchanges/challenge_giftexchange.feature b/features/gift_exchanges/challenge_giftexchange.feature index b4c687a4741..7c2dbd9f532 100644 --- a/features/gift_exchanges/challenge_giftexchange.feature +++ b/features/gift_exchanges/challenge_giftexchange.feature @@ -639,6 +639,28 @@ Feature: Gift Exchange Challenge Then I should see "My Assignments" And I should not see "Awesome Gift Exchange" + Scenario: Information regarding the status of an assignment is not confusing (AO3-7140) + Given everyone has their assignment for "Non Confusing Exchange" + When I am logged in as "myname1" + And I go to the assignments page for "myname1" + Then I should see "My Assignments" + And I should see "Non Confusing Exchange" + When I follow "Fullfill" + And I fill in the basic work information for "InProgress" + And I follow "Preview" + And I go to the assignments page for "myname1" + Then I should see "(draft)" + And I should see "Status: Unposted" + And I should see "Created" + When I post "InProgress" + And I got to the assignment page for "myname1" + And I follow "Completed Assignments" + Then I should see "InProgress" + And I should not see "Status: Unposted" + And I should not see "Created" + And I should not see "(draft)" + And I should see "Status: Complete" + Scenario: A mod can purge assignments after they have been sent, but must first confirm the action Given everyone has their assignments for "Bad Gift Exchange" From c062dfe5e960fd6b1249fc88054f4bdc6f40ab87 Mon Sep 17 00:00:00 2001 From: ReverM Date: Mon, 12 Jan 2026 15:35:07 -0500 Subject: [PATCH 4/6] Fixed issues with the test --- features/gift_exchanges/challenge_giftexchange.feature | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/features/gift_exchanges/challenge_giftexchange.feature b/features/gift_exchanges/challenge_giftexchange.feature index 7c2dbd9f532..6703caf3341 100644 --- a/features/gift_exchanges/challenge_giftexchange.feature +++ b/features/gift_exchanges/challenge_giftexchange.feature @@ -640,20 +640,20 @@ Feature: Gift Exchange Challenge And I should not see "Awesome Gift Exchange" Scenario: Information regarding the status of an assignment is not confusing (AO3-7140) - Given everyone has their assignment for "Non Confusing Exchange" + Given everyone has their assignments for "Non Confusing Exchange" When I am logged in as "myname1" And I go to the assignments page for "myname1" Then I should see "My Assignments" And I should see "Non Confusing Exchange" - When I follow "Fullfill" + When I follow "Fulfill" And I fill in the basic work information for "InProgress" - And I follow "Preview" + And I press "Preview" And I go to the assignments page for "myname1" Then I should see "(draft)" And I should see "Status: Unposted" And I should see "Created" - When I post "InProgress" - And I got to the assignment page for "myname1" + When I post the work "InProgress" + And I go to the assignments page for "myname1" And I follow "Completed Assignments" Then I should see "InProgress" And I should not see "Status: Unposted" From af71251be33178e395a32a85294936d96cd49fe0 Mon Sep 17 00:00:00 2001 From: ReverM Date: Mon, 12 Jan 2026 16:37:19 -0500 Subject: [PATCH 5/6] Fixed Linter issues --- app/views/challenge_assignments/_assignment_blurb.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/challenge_assignments/_assignment_blurb.html.erb b/app/views/challenge_assignments/_assignment_blurb.html.erb index d52115a8b95..a91389a7ed1 100755 --- a/app/views/challenge_assignments/_assignment_blurb.html.erb +++ b/app/views/challenge_assignments/_assignment_blurb.html.erb @@ -12,7 +12,7 @@
<% # link to the work %> <% if assignment.creation %> - <%= link_to (assignment.creation.try(:title) || assignment.creation.class.name), assignment.creation, :class => "work" %> + <%= link_to (assignment.creation.try(:title) || assignment.creation.class.name), assignment.creation, class: "work" %> <% if !assignment.posted? %> <%= t(".draft_header") %> <% end %> @@ -43,10 +43,10 @@ <% if assignment.creation %> <% if assignment.posted? %> -
<%= t(".stats.creation.posted")%>
+
<%= t(".stats.creation.posted") %>
<%= assignment.creation.published_at %>
<% else %> -
<%= t(".stats.creation.unposted")%>
+
<%= t(".stats.creation.unposted") %>
<%= assignment.creation.created_at %>
<% end %> From 9a12d3614332c8462526ec2d5c61a09c7390b953 Mon Sep 17 00:00:00 2001 From: ReverM Date: Mon, 12 Jan 2026 16:42:22 -0500 Subject: [PATCH 6/6] Normalized locales file --- config/locales/views/en.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index be32059a9f0..2d181b71b41 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -573,11 +573,11 @@ en: draft_header: " (draft)" stats: creation: - posted: "Posted:" - unposted: "Created:" - status: - fullfilled: "Complete!" - header: "Status:" + posted: 'Posted:' + unposted: 'Created:' + status: + fullfilled: Complete! + header: 'Status:' unfullfilled: Unapproved unposted: Unposted to_default: