From ae67fc486598b48343edba6b24a2dbc3b4ba7506 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 15 Feb 2023 18:05:27 +0100 Subject: [PATCH] [TASK] Streamline backend user/-group total amount output Streamline total amount text for backend groups and backend user listing. Also correct wording is applied, depending on the number of records displayed. Resolves: #99966 Releases: main, 12.4 Change-Id: Ie96dfc1148d4eafcc4418b7187645bf4831262f3 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/77874 Tested-by: core-ci Tested-by: Benni Mack Reviewed-by: Benni Mack Reviewed-by: Oliver Klee Tested-by: Jochen Reviewed-by: Jochen --- .../beuser/Resources/Private/Language/locallang.xlf | 12 +++++++++--- .../Private/Partials/BackendUser/PaginatedList.html | 7 ++++--- .../Partials/BackendUserGroup/PaginatedList.html | 5 ++++- .../Private/Templates/BackendUser/Online.html | 11 +++++++++++ .../Application/BackendUser/ListUserCest.php | 2 +- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf b/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf index a0ce73df0d03..e01988510353 100644 --- a/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf +++ b/typo3/sysext/beuser/Resources/Private/Language/locallang.xlf @@ -1,6 +1,6 @@ - +
@@ -36,6 +36,9 @@ Users + + User + Yes @@ -213,6 +216,9 @@ Groups + + Group + Directly assigned @@ -339,10 +345,10 @@ Storage - %s filemounts + %s Filemounts - 1 filemount + 1 Filemount diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html index f8299330d5d2..02a848bc2721 100644 --- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html +++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html @@ -143,7 +143,10 @@ - {totalAmountOfBackendUsers} + + {totalAmountOfBackendUsers} + {totalAmountOfBackendUsers} + @@ -151,5 +154,3 @@ - - diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html index 5488eac6290e..d537a6355f57 100644 --- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html +++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html @@ -110,7 +110,10 @@ - {totalAmountOfBackendUserGroups} + + {totalAmountOfBackendUserGroups} + {totalAmountOfBackendUserGroups} + diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html index a20902a270b0..96c8637cfe4e 100644 --- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html +++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html @@ -78,6 +78,17 @@

+ + + + {onlineUsersAndSessions -> f:count()} + + {onlineUsersAndSessionsCount} + {onlineUsersAndSessionsCount} + + + + diff --git a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php index f31dc0fa7838..910bf40fd0cc 100644 --- a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/ListUserCest.php @@ -190,7 +190,7 @@ private function checkCountOfUsers(ApplicationTester $I, int $countOfUsers): voi $I->canSeeNumberOfElements('#typo3-backend-user-list tbody tr', $countOfUsers); $I->wantToTest('If a number of users is shown in the footer row'); $I->canSeeNumberOfElements('#typo3-backend-user-list tfoot tr', 1); - $I->see($countOfUsers . ' Users', '#typo3-backend-user-list tfoot tr'); + $I->see($countOfUsers . ' User', '#typo3-backend-user-list tfoot tr'); } private function openAndCloseTheEditForm(ApplicationTester $I, string $username): void