From fbb9ea7a7a092b6f2fb8adb45dd193a7acf9008d Mon Sep 17 00:00:00 2001 From: JasCon Date: Wed, 20 May 2026 09:52:27 +0100 Subject: [PATCH 1/3] PDJB-883: remove disabled button --- .../inviteLocalCouncilAdminConfirmation.html | 54 +++++++++---------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html b/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html index 6f3771ab9b..218d564f89 100644 --- a/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html +++ b/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html @@ -1,31 +1,25 @@ - - -
-
-
- addLocalCouncilUserSuccess.banner.body -
-

common.whatHappensNext

-

- addLocalCouncilUserSuccess.whatHappensNext.para1 -

-

- addLocalCouncilUserSuccess.whatHappensNext.para2 -

-

- forms.inviteLocalCouncilAdminUserConfirmation.whatHappensNext.paragraph.three -

-
- - addLocalCouncilUserSuccess.inviteAnother - - - - addLocalCouncilUserSuccess.returnToDashboard - -
-
-
+ + +
+
+
+ addLocalCouncilUserSuccess.banner.body +
+

common.whatHappensNext

+

+ addLocalCouncilUserSuccess.whatHappensNext.para1 +

+

+ addLocalCouncilUserSuccess.whatHappensNext.para2 +

+

+ forms.inviteLocalCouncilAdminUserConfirmation.whatHappensNext.paragraph.three +

+ + addLocalCouncilUserSuccess.inviteAnother + +
+
\ No newline at end of file From abb7a68c7c2766d7630d36aef84976d963f75cbf Mon Sep 17 00:00:00 2001 From: JasCon Date: Wed, 20 May 2026 09:53:28 +0100 Subject: [PATCH 2/3] PDJB-883: remove disabled button link fragment --- .../buttons/disabledSecondaryButtonLink.html | 11 ----- .../inviteLocalCouncilAdminConfirmation.html | 48 +++++++++---------- 2 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 src/main/resources/templates/fragments/buttons/disabledSecondaryButtonLink.html diff --git a/src/main/resources/templates/fragments/buttons/disabledSecondaryButtonLink.html b/src/main/resources/templates/fragments/buttons/disabledSecondaryButtonLink.html deleted file mode 100644 index ef42404d9e..0000000000 --- a/src/main/resources/templates/fragments/buttons/disabledSecondaryButtonLink.html +++ /dev/null @@ -1,11 +0,0 @@ - - secondaryButtonLink text - \ No newline at end of file diff --git a/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html b/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html index 218d564f89..f6f28f39f0 100644 --- a/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html +++ b/src/main/resources/templates/inviteLocalCouncilAdminConfirmation.html @@ -1,25 +1,25 @@ - - -
-
-
- addLocalCouncilUserSuccess.banner.body -
-

common.whatHappensNext

-

- addLocalCouncilUserSuccess.whatHappensNext.para1 -

-

- addLocalCouncilUserSuccess.whatHappensNext.para2 -

-

- forms.inviteLocalCouncilAdminUserConfirmation.whatHappensNext.paragraph.three -

- - addLocalCouncilUserSuccess.inviteAnother - -
-
+ + +
+
+
+ addLocalCouncilUserSuccess.banner.body +
+

common.whatHappensNext

+

+ addLocalCouncilUserSuccess.whatHappensNext.para1 +

+

+ addLocalCouncilUserSuccess.whatHappensNext.para2 +

+

+ forms.inviteLocalCouncilAdminUserConfirmation.whatHappensNext.paragraph.three +

+ + addLocalCouncilUserSuccess.inviteAnother + +
+
\ No newline at end of file From 586b0704489f9964f87841d007110beaa874d133 Mon Sep 17 00:00:00 2001 From: JasCon Date: Wed, 20 May 2026 15:58:59 +0100 Subject: [PATCH 3/3] PDJB-883: Don't pass a dashboard url to the template --- .../webapp/controllers/ManageLocalCouncilAdminsController.kt | 2 -- .../prsdb/webapp/integration/InviteLocalCouncilAdminTests.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/ManageLocalCouncilAdminsController.kt b/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/ManageLocalCouncilAdminsController.kt index 41f7aa04db..7f11df687c 100644 --- a/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/ManageLocalCouncilAdminsController.kt +++ b/src/main/kotlin/uk/gov/communities/prsdb/webapp/controllers/ManageLocalCouncilAdminsController.kt @@ -119,8 +119,6 @@ class ManageLocalCouncilAdminsController( } model.addAttribute("inviteAnotherUserUrl", INVITE_LOCAL_COUNCIL_ADMIN_ROUTE) - // TODO PRSD-672: Add link to the system operator dashboard - model.addAttribute("dashboardUrl", "#") return "inviteLocalCouncilAdminConfirmation" } diff --git a/src/test/kotlin/uk/gov/communities/prsdb/webapp/integration/InviteLocalCouncilAdminTests.kt b/src/test/kotlin/uk/gov/communities/prsdb/webapp/integration/InviteLocalCouncilAdminTests.kt index ad8cd9e85b..b1d04c92be 100644 --- a/src/test/kotlin/uk/gov/communities/prsdb/webapp/integration/InviteLocalCouncilAdminTests.kt +++ b/src/test/kotlin/uk/gov/communities/prsdb/webapp/integration/InviteLocalCouncilAdminTests.kt @@ -40,8 +40,6 @@ class InviteLocalCouncilAdminTests : IntegrationTestWithMutableData("data-local. // Invite another user confirmationPage.inviteAnotherUserButton.clickAndWait() assertPageIs(page, InviteLocalCouncilAdminPage::class) - - // TODO PRSD-672 - check the Return to Dashboard button } @Test