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

Jump to bottom

IBX-380: Cannot deselect the subtree in Admin -> Roles #1757

Merged
merged 2 commits into from
May 21, 2021
Merged

IBX-380: Cannot deselect the subtree in Admin -> Roles #1757

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
debbd9a
IBX-380: Cannot deselect the subtree in Admin -> Roles
lucasOsti May 17, 2021
090e543
After CR
lucasOsti May 18, 2021
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
4 changes: 4 additions & 0 deletions src/bundle/Resources/public/js/scripts/admin.role_assignment.add.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@
event.preventDefault();

const config = JSON.parse(event.currentTarget.dataset.udwConfig);
const { inputSelector } = event.currentTarget.dataset;
const selectedLocations = doc.querySelector(inputSelector).value;
const selectedLocationsIds = selectedLocations ? selectedLocations.split(',') : [];

ReactDOM.render(
React.createElement(eZ.modules.UniversalDiscovery, {
onConfirm: selectSubtreeConfirm.bind(this),
onCancel: closeUDW,
multiple: true,
selectedLocations: selectedLocationsIds,
...config,
}),
udwContainer
Expand Down
8 changes: 6 additions & 2 deletions src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

{% block form %}
{{ form_start(form) }}

<section>
<div class="card ez-card ez-card--light">
<div class="ez-card__header ez-card__header--secondary">
Expand Down Expand Up @@ -112,7 +111,12 @@
{{ form_widget(form.limitation_type.location, {'label': 'limitation_type.subtree'|trans|desc('Subtree'), 'attr': {'class': 'ez-limitations__radio ez-input ez-input--radio', 'data-disable-selector': '#role_assignment_create_locations_select_content'}, 'label_attr': {'class': 'ez-limitations__label radio-inline'}}) }}
{{ form_widget(form.locations) }}
<div class="ez-limitations__item-subtree">
<button id="role_assignment_create_locations_select_content" data-udw-config="{{ ez_udw_config('multiple', {}) }}" class="btn btn-secondary ez-btn--select-subtree"{% if not form.limitation_type.location.vars.checked %} disabled{% endif %}>
<button
id="role_assignment_create_locations_select_content"
data-input-selector="#{{ form.locations.vars.id }}"
data-udw-config="{{ ez_udw_config('multiple', {}) }}"
class="btn btn-secondary ez-btn--select-subtree"{% if not form.limitation_type.location.vars.checked %} disabled{% endif %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if is outside of the classes, shouldn't be in the next line?

>
<svg class="ez-icon ez-icon--select-subtree ez-icon--medium ez-icon--light">
<use xlink:href="{{ ez_icon_path('relations') }}"></use>
</svg>
Expand Down