Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUGFIX: Share same role details when adding user as when editing them #5206

Merged
merged 1 commit into from
Jan 17, 2025
Merged

BUGFIX: Share same role details when adding user as when editing them #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 2 additions & 78 deletions Neos.Neos/Resources/Private/Partials/Module/Shared/EditAccount.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="neos-control-group">
<label class="neos-control-label">{neos:backend.translate(source: 'Modules', id: 'users.username')}</label>
<div class="neos-controls">
<span class="neos-span12 neos-uneditable-input" title="{neos:backend.translate(source: 'Modules', id: 'users.usernameCannotBeChanged')}">{account.accountIdentifier}</span>
<span class="neos-span12 neos-uneditable-input" title="{neos:backend.translate(source: 'Modules', id: 'users.usernameCannotBeChanged')}">{account.accountIdentifier}</span>
</div>
</div>

Expand All @@ -28,83 +28,7 @@

<f:if condition="{showRoles}">
<fieldset class="neos-span6">
<legend class="neos-control-label">{neos:backend.translate(source: 'Modules', id: 'users.roles')}</legend>
<table class="neos-table" data-neos-expandable="dropdown-group">
<thead>
<tr>
<th></th>
<th>Label</th>
<th>Description</th>
<th></th>
</tr>
</thead>
<tbody>
<f:for each="{availableRoles}" as="role" iteration="rolesIteration">
<tr>
<td>
<div class="neos-controls">
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.identifier}" data-neos-toggle="tooltip" data-placement="right">
<f:form.checkbox name="roleIdentifiers" multiple="true" value="{role.identifier}" id="roles-{rolesIteration.cycle}" checked="{f:security.ifHasRole(role: role, account: account, then: true, else: false)}"/>
<span></span>
</label>
</div>
</td>
<td>
<div class="neos-controls">
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.identifier}" data-neos-toggle="tooltip" data-placement="right">
{role.label}
</label>
</div>
</td>
<td>
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.label}" data-neos-toggle="tooltip" data-placement="right">{role.description}</label>
</td>
<td class="neos-action">
<div class="neos-pull-right">
<button data-neos-toggle="tooltip" title="{role.identifier}" class="neos-button neos-dropdown-trigger" aria-controls="neos-dropdown-content-{rolesIteration.cycle}" aria-expanded="false">
<i class="fas fa-info-circle icon-white"></i>
</button>
</div>
</td>
</tr>
<tr id="neos-dropdown-content-{rolesIteration.cycle}" class="neos-dropdown-content" hidden="true">
<td></td>
<td colspan="2">
<h2>{neos:backend.translate(source: 'Modules', id: 'users.roles.directlyAssignedPrivileges')}</h2>
<ul>
<f:render section="privileges" arguments="{role:role}"/>
<f:render section="parentRoles" arguments="{role:role}"/>
</ul>
</td>
<td></td>
</tr>
</f:for>
</tbody>
</table>
<f:render partial="Module/Shared/RolesSelection" arguments="{availableRoles: availableRoles, account: account}" />
</fieldset>
</f:if>
</div>

<f:section name="parentRoles">
<f:for each="{role.allParentRoles}" as="role">
<f:if condition="{role.privileges->f:count()} > 0">
<h2><neos:backend.translate id="users.roles.fromParentRole" arguments="{role:role.label}" source="Modules" package="Neos.Neos"/></h2>
<f:render section="privileges" arguments="{role:role}"/>
</f:if>
</f:for>
</f:section>

<f:section name="privileges">
<f:for each="{role.privileges}" as="privilege">
<li>
<label>
<f:switch expression="{privilege.permission}">
<f:case value="grant"><span class="neos-badge neos-badge-success">Grant</span></f:case>
<f:case value="deny"><span class="neos-badge neos-badge-important">Denied</span></f:case>
<f:case value="abstain"><span class="neos-badge neos-badge-inverse">Abstain</span></f:case>
</f:switch>
{privilege.privilegeTarget.label}
</label>
</li>
</f:for>
</f:section>
85 changes: 85 additions & 0 deletions Neos.Neos/Resources/Private/Partials/Module/Shared/RolesSelection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{namespace neos=Neos\Neos\ViewHelpers}
<legend class="neos-control-label">{neos:backend.translate(source: 'Modules', id: 'users.roles')}</legend>
<table class="neos-table" data-neos-expandable="dropdown-group">
<thead>
<tr>
<th></th>
<th>Label</th>
<th>Description</th>
<th></th>
</tr>
</thead>
<tbody>
<f:for each="{availableRoles}" as="role" iteration="rolesIteration">
<tr>
<td>
<div class="neos-controls">
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.identifier}" data-neos-toggle="tooltip" data-placement="right">
<f:if condition="{account}">
<f:then>
<f:form.checkbox name="roleIdentifiers" multiple="true" value="{role.identifier}" id="roles-{rolesIteration.cycle}" checked="{f:security.ifHasRole(role: role, account: account, then: true, else: false)}"/>
</f:then>
<f:else>
<f:form.checkbox name="roleIdentifiers" multiple="true" value="{role.identifier}" id="roles-{rolesIteration.cycle}"/>
</f:else>
</f:if>
<span></span>
</label>
</div>
</td>
<td>
<div class="neos-controls">
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.identifier}" data-neos-toggle="tooltip" data-placement="right">
{role.label}
</label>
</div>
</td>
<td>
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.label}" data-neos-toggle="tooltip" data-placement="right">{role.description}</label>
</td>
<td class="neos-action">
<div class="neos-pull-right">
<button data-neos-toggle="tooltip" title="{role.identifier}" class="neos-button neos-dropdown-trigger" aria-controls="neos-dropdown-content-{rolesIteration.cycle}" aria-expanded="false">
<i class="fas fa-info-circle icon-white"></i>
</button>
</div>
</td>
</tr>
<tr id="neos-dropdown-content-{rolesIteration.cycle}" class="neos-dropdown-content" hidden="true">
<td></td>
<td colspan="2">
<h2>{neos:backend.translate(source: 'Modules', id: 'users.roles.directlyAssignedPrivileges')}</h2>
<ul>
<f:render section="privileges" arguments="{role:role}"/>
<f:render section="parentRoles" arguments="{role:role}"/>
</ul>
</td>
<td></td>
</tr>
</f:for>
</tbody>
</table>

<f:section name="parentRoles">
<f:for each="{role.allParentRoles}" as="role">
<f:if condition="{role.privileges->f:count()} > 0">
<h2><neos:backend.translate id="users.roles.fromParentRole" arguments="{role:role.label}" source="Modules" package="Neos.Neos"/></h2>
<f:render section="privileges" arguments="{role:role}"/>
</f:if>
</f:for>
</f:section>

<f:section name="privileges">
<f:for each="{role.privileges}" as="privilege">
<li>
<label>
<f:switch expression="{privilege.permission}">
<f:case value="grant"><span class="neos-badge neos-badge-success">Grant</span></f:case>
<f:case value="deny"><span class="neos-badge neos-badge-important">Denied</span></f:case>
<f:case value="abstain"><span class="neos-badge neos-badge-inverse">Abstain</span></f:case>
</f:switch>
{privilege.privilegeTarget.label}
</label>
</li>
</f:for>
</f:section>
36 changes: 15 additions & 21 deletions Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,17 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'password'}"/>
</div>
</div>
<f:if condition="{providers -> f:count()} > 1">
<f:then>
<div class="neos-control-group{f:validation.ifHasErrors(for: 'authenticationProviderName', then: ' neos-error')}">
<label class="neos-control-label" for="authenticationProviderName">{neos:backend.translate(id: 'users.new.userData.authenticationProviderName', value: 'Authentication Provider', source: 'Modules', package: 'Neos.Neos')}</label>
<div class="neos-controls">
<f:form.select name="authenticationProviderName" id="authenticationProviderName" options="{providers}" optionLabelField="label" optionValueField="identifier" prependOptionLabel="{neos:backend.translate(id: 'users.new.userData.authenticationProviderName.useDefault', source: 'Modules', value: 'Use system default')}" prependOptionValue="" class="neos-span12" />
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'authenticationProviderName'}"/>
</div>
</div>
</f:then>
</f:if>
<div class="neos-control-group">
<label class="neos-control-label">{neos:backend.translate(id: 'users.new.userData.roles', value: 'Role(s)', source: 'Modules', package: 'Neos.Neos')}</label>
<f:for each="{roles}" as="role" iteration="rolesIteration">
<div class="neos-controls">
<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.packageKey}" data-neos-toggle="tooltip" data-placement="right">
<f:form.checkbox name="roleIdentifiers" multiple="true" value="{role.identifier}" id="roles-{rolesIteration.cycle}" /><span></span>
{f:if(condition: role.label, then: role.label, else: role.name)}
</label>
<f:if condition="{providers -> f:count()} > 1">
<f:then>
<div class="neos-control-group{f:validation.ifHasErrors(for: 'authenticationProviderName', then: ' neos-error')}">
<label class="neos-control-label" for="authenticationProviderName">{neos:backend.translate(id: 'users.new.userData.authenticationProviderName', value: 'Authentication Provider', source: 'Modules', package: 'Neos.Neos')}</label>
<div class="neos-controls">
<f:form.select name="authenticationProviderName" id="authenticationProviderName" options="{providers}" optionLabelField="label" optionValueField="identifier" prependOptionLabel="{neos:backend.translate(id: 'users.new.userData.authenticationProviderName.useDefault', source: 'Modules', value: 'Use system default')}" prependOptionValue="" class="neos-span12" />
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'authenticationProviderName'}"/>
</div>
</div>
</f:for>
</div>
</f:then>
</f:if>
</fieldset>

<fieldset class="neos-span5 neos-offset1">
Expand Down Expand Up @@ -86,6 +75,11 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
</div>
</fieldset>
</div>
<div class="neos-row-fluid">
<fieldset class="neos-span12">
<f:render partial="Module/Shared/RolesSelection" arguments="{availableRoles: roles, account: null}" />
</fieldset>
</div>
<div class="neos-footer">
<f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'cancel', value: 'Cancel', source: 'Modules', package: 'Neos.Neos')}</f:link.action>
<f:form.submit value="{neos:backend.translate(id: 'users.new.createButton', value: 'Create user', source: 'Modules', package: 'Neos.Neos')}" class="neos-button neos-button-primary" />
Expand Down
Loading