Skip to content
Snippets Groups Projects
Commit 14a14944 authored by Benjamin Kott's avatar Benjamin Kott
Browse files

[TASK] Show backend user groups in backend users list view 

If you are managing backend users, it is now also possible to view
the assigned groups directly. The hardcoded edit labels are now
also replaced with the respecting translatable variants.

Resolves: #103231
Releases: main
Change-Id: Icbf16f420689b288d5f334c94872b71112ac83f0
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83162


Reviewed-by: default avatarFrank Nägler <frank.naegler@typo3.com>
Tested-by: default avatarOliver Bartsch <bo@cedev.de>
Reviewed-by: default avatarOliver Bartsch <bo@cedev.de>
Reviewed-by: default avatarBenjamin Kott <benjamin.kott@outlook.com>
Tested-by: default avatarFrank Nägler <frank.naegler@typo3.com>
Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarBenjamin Kott <benjamin.kott@outlook.com>
parent 93e6d6d8
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 13 deletions
typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html
+ 8
− 2
View file @ 14a14944
......@@ -11,6 +11,7 @@
<thead>
<tr>
<th colspan="2"><f:translate key="userName" /> / <f:translate key="realName" /></th>
<th><f:translate key="backendUserGroup" /></th>
<th><f:translate key="lastLogin" /></th>
<th class="col-control"></th>
</tr>
......@@ -30,7 +31,7 @@
</a>
</td>
<td class="col-title">
<backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
<backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="{f:translate(key:'edit')}">
<b>{backendUser.userName}</b>
</backend:link.editRecord>
<f:if condition="{onlineBackendUsers.{backendUser.uid}}">
......@@ -39,11 +40,16 @@
<beuser:mfaStatus userUid="{backendUser.uid}"/>
<br>
<f:if condition="{backendUser.realName}">
<backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
<backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="{f:translate(key:'edit')}">
{backendUser.realName}
</backend:link.editRecord>
</f:if>
</td>
<td class="nowrap-disabled">
<f:for each="{backendUser.backendUserGroups}" as="backendUserGroup" iteration="backendUserGroupIterator">
<backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}" class="nowrap">{backendUserGroup.title}</backend:link.editRecord><f:if condition="!{backendUserGroupIterator.isLast}">,</f:if>
</f:for>
</td>
<td class="col-datetime">
<f:if condition="{backendUser.lastLoginDateAndTime}">
<f:then>
......
typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html
+ 3
− 6
View file @ 14a14944
......@@ -30,22 +30,19 @@
</a>
</td>
<td class="title">
<backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="edit">
<backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}">
<b>{backendUserGroup.title}</b><br>
{backendUser.realName}
</backend:link.editRecord>
</td>
<td class="nowrap-disabled">
<f:for each="{backendUserGroup.subgroups}" as="subgroup" iteration="subGroupIterator">
<backend:link.editRecord table="be_groups" uid="{subgroup.uid}" title="edit">
{subgroup.title}
</backend:link.editRecord>
<f:if condition="!{subGroupIterator.isLast}">, </f:if>
<backend:link.editRecord table="be_groups" uid="{subgroup.uid}" title="{f:translate(key:'edit')}">{subgroup.title}</backend:link.editRecord><f:if condition="!{subGroupIterator.isLast}">,</f:if>
</f:for>
</td>
<td class="col-control">
<div class="btn-group" role="group">
<backend:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="edit">
<backend:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}">
<core:icon identifier="actions-open" />
</backend:link.editRecord>
<f:if condition="{backendUserGroup.hidden}">
......
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
+ 1
− 1
View file @ 14a14944
......@@ -24,7 +24,7 @@
<f:link.action action="removeFromCompareList" arguments="{uid: compareData.user.uid, redirectToCompare:1}" class="btn btn-default">
<core:icon identifier="actions-minus" size="small"/>
</f:link.action>
<backend:link.editRecord class="btn btn-default" table="be_users" uid="{compareData.user.uid}" title="edit">
<backend:link.editRecord class="btn btn-default" table="be_users" uid="{compareData.user.uid}" title="{f:translate(key:'edit')}">
<core:icon identifier="actions-open" />
</backend:link.editRecord>
</div>
......
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/List.html
+ 2
− 2
View file @ 14a14944
......@@ -29,7 +29,7 @@
</a>
</td>
<td class="col-title">
<backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="edit">
<backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="{f:translate(key:'edit')}">
<b>{compareUser.username}</b>
</backend:link.editRecord>
<f:if condition="{onlineBackendUsers.{compareUser.uid}}">
......@@ -37,7 +37,7 @@
</f:if>
<br>
<f:if condition="{compareUser.realName}">
<backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="edit">
<backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="{f:translate(key:'edit')}">
{compareUser.realName}
</backend:link.editRecord>
</f:if>
......
typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php
+ 2
− 2
View file @ 14a14944
......@@ -47,7 +47,7 @@ final class CompareUserCest
// first user can be edited
$usernameFirstCompare = $I->grabTextFrom('#tx_beuser_compare > thead > tr > th:nth-child(2) > div > div > span');
$I->click('#tx_beuser_compare > thead > tr > th:nth-child(2) a[title="edit"]');
$I->click('#tx_beuser_compare > thead > tr > th:nth-child(2) a[title="Edit"]');
$I->waitForElementNotVisible('#t3js-ui-block');
$I->waitForElementVisible('#EditDocumentController');
$I->canSee('Edit Backend user "' . $usernameFirstCompare . '" on root level');
......@@ -59,7 +59,7 @@ final class CompareUserCest
// second user can be edited
$usernameFirstCompare = $I->grabTextFrom('#tx_beuser_compare > thead > tr > th:nth-child(3) > div > div > span');
$I->click('#tx_beuser_compare > thead > tr > th:nth-child(3) a[title="edit"]');
$I->click('#tx_beuser_compare > thead > tr > th:nth-child(3) a[title="Edit"]');
$I->waitForElementNotVisible('#t3js-ui-block');
$I->waitForElementVisible('#EditDocumentController');
$I->canSee('Edit Backend user "' . $usernameFirstCompare . '" on root level');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment