From 0ef51b24aba26fe1a3bed1dec4b09d3cdd3d903a Mon Sep 17 00:00:00 2001 From: floss4good Date: Wed, 10 Dec 2025 17:09:59 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20'More=20actions'=20(=E2=8B=AF)=20dropdow?= =?UTF-8?q?n=20from=20moderation=20reports=20overview=20page=20(#10339)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up of !8716 (and !9951) A _More actions_ (`⋯`) dropdown (where content related actions are available) was added with !8716 for the moderation reports overview page. Until that PR was merged another PR (!9951) changed the structure of JS-less dropdowns and adjusted the CSS rules. This PR adds the missing `.content` container for the dropdown added with !8716 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10339 Reviewed-by: 0ko <0ko@noreply.codeberg.org> Co-authored-by: floss4good Co-committed-by: floss4good --- templates/admin/moderation/reports.tmpl | 72 +++++++++++----------- tests/integration/admin_moderation_test.go | 27 ++++---- 2 files changed, 52 insertions(+), 47 deletions(-) diff --git a/templates/admin/moderation/reports.tmpl b/templates/admin/moderation/reports.tmpl index d1de0106ce..6145694b89 100644 --- a/templates/admin/moderation/reports.tmpl +++ b/templates/admin/moderation/reports.tmpl @@ -72,42 +72,44 @@ {{svg "octicon-x"}} {{if .ContentReference}} {{/* the reference is missing when the content was already deleted */}} -
+
{{svg "octicon-kebab-horizontal"}} - +
+ +
{{end}} diff --git a/tests/integration/admin_moderation_test.go b/tests/integration/admin_moderation_test.go index 7007a5a821..7fd086c33c 100644 --- a/tests/integration/admin_moderation_test.go +++ b/tests/integration/admin_moderation_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" ) -func testReportDetails(t *testing.T, htmlDoc *HTMLDoc, reportID, contentIcon, contentRef, contentURL, category, reportsNo string) { +func testReportDetails(t *testing.T, htmlDoc *HTMLDoc, reportID, contentIcon, contentRef, contentURL, category, reportsNo string, hasMoreActions bool) { // Check icon octicon icon := htmlDoc.Find("#report-" + reportID + " svg." + contentIcon) assert.Equal(t, 1, icon.Length()) @@ -49,6 +49,9 @@ func testReportDetails(t *testing.T, htmlDoc *HTMLDoc, reportID, contentIcon, co count := htmlDoc.Find("#report-" + reportID + " a span") assert.Equal(t, 1, count.Length()) assert.Equal(t, reportsNo, count.Text()) + + // Check 'More actions' (⋯) dropdown + htmlDoc.AssertElement(t, "#report-"+reportID+" > .flex-item-trailing .button-sequence details.dropdown", hasMoreActions) } func TestAdminModerationViewReports(t *testing.T) { @@ -92,24 +95,24 @@ func TestAdminModerationViewReports(t *testing.T) { assert.Equal(t, 11, reports.Length()) // Check details for shown reports. - testReportDetails(t, htmlDoc, "1", "octicon-person", "@SPAM-services", "/SPAM-services", "Illegal content", "1") - testReportDetails(t, htmlDoc, "2", "octicon-repo", "SPAM-services/spammer-Tools", "/SPAM-services/spammer-Tools", "Illegal content", "1") - testReportDetails(t, htmlDoc, "3", "octicon-issue-opened", "SPAM-services/spammer-Tools#1", "/SPAM-services/spammer-Tools/issues/1", "Spam", "1") + testReportDetails(t, htmlDoc, "1", "octicon-person", "@SPAM-services", "/SPAM-services", "Illegal content", "1", true) + testReportDetails(t, htmlDoc, "2", "octicon-repo", "SPAM-services/spammer-Tools", "/SPAM-services/spammer-Tools", "Illegal content", "1", true) + testReportDetails(t, htmlDoc, "3", "octicon-issue-opened", "SPAM-services/spammer-Tools#1", "/SPAM-services/spammer-Tools/issues/1", "Spam", "1", true) // #4 is combined with #7 and #9 - testReportDetails(t, htmlDoc, "4", "octicon-person", "@spammer01", "/spammer01", "Spam", "3") + testReportDetails(t, htmlDoc, "4", "octicon-person", "@spammer01", "/spammer01", "Spam", "3", true) // #5 is combined with #6 - testReportDetails(t, htmlDoc, "5", "octicon-comment", "contributor/first/issues/1#issuecomment-1001", "/contributor/first/issues/1#issuecomment-1001", "Malware", "2") - testReportDetails(t, htmlDoc, "8", "octicon-issue-opened", "contributor/first#1", "/contributor/first/issues/1", "Other violations of platform rules", "1") + testReportDetails(t, htmlDoc, "5", "octicon-comment", "contributor/first/issues/1#issuecomment-1001", "/contributor/first/issues/1#issuecomment-1001", "Malware", "2", true) + testReportDetails(t, htmlDoc, "8", "octicon-issue-opened", "contributor/first#1", "/contributor/first/issues/1", "Other violations of platform rules", "1", true) // #10 is for a Ghost user - testReportDetails(t, htmlDoc, "10", "octicon-person", "Reported content with type 1 and id 9999 no longer exists", "", "Other violations of platform rules", "1") + testReportDetails(t, htmlDoc, "10", "octicon-person", "Reported content with type 1 and id 9999 no longer exists", "", "Other violations of platform rules", "1", false) // #11 is for a comment who's poster was deleted - testReportDetails(t, htmlDoc, "11", "octicon-comment", "contributor/first/issues/1#issuecomment-1003", "/contributor/first/issues/1#issuecomment-1003", "Spam", "1") + testReportDetails(t, htmlDoc, "11", "octicon-comment", "contributor/first/issues/1#issuecomment-1003", "/contributor/first/issues/1#issuecomment-1003", "Spam", "1", true) // #12 is for a comment that was deleted but its poster still exists - testReportDetails(t, htmlDoc, "12", "octicon-comment", "Reported content with type 4 and id 9991 no longer exists", "", "Other violations of platform rules", "1") + testReportDetails(t, htmlDoc, "12", "octicon-comment", "Reported content with type 4 and id 9991 no longer exists", "", "Other violations of platform rules", "1", false) // #13 is for a comment that was deleted and the poster was also deleted - testReportDetails(t, htmlDoc, "13", "octicon-comment", "Reported content with type 4 and id 9992 no longer exists", "", "Spam", "1") + testReportDetails(t, htmlDoc, "13", "octicon-comment", "Reported content with type 4 and id 9992 no longer exists", "", "Spam", "1", false) // #14 is for a issue that was deleted but its poster still exists - testReportDetails(t, htmlDoc, "14", "octicon-issue-opened", "Reported content with type 3 and id 9991 no longer exists", "", "Spam", "1") + testReportDetails(t, htmlDoc, "14", "octicon-issue-opened", "Reported content with type 3 and id 9991 no longer exists", "", "Spam", "1", false) t.Run("reports details page", func(t *testing.T) { defer tests.PrintCurrentTest(t)()