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.

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

Auth Twig UI (Part 1) #16951

Merged
merged 5 commits into from
Jun 3, 2024
Merged

Auth Twig UI (Part 1) #16951

merged 5 commits into from
Jun 3, 2024

Conversation

cconard96
Copy link
Contributor

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -

See changelog for intended changes/removals/fixes.

@cconard96 cconard96 force-pushed the ui/auth branch 2 times, most recently from 91b0dd2 to 74d6e8b Compare April 19, 2024 23:21
@cconard96 cconard96 changed the title Auth Twig UI Auth Twig UI (Part 1) Apr 19, 2024
@cconard96 cconard96 removed the wip label Apr 19, 2024
@cconard96 cconard96 marked this pull request as ready for review April 19, 2024 23:21
templates/pages/setup/ldap/form.html.twig Outdated Show resolved Hide resolved
}) }}

{{ fields.dropdownYesNo('use_bind', item.fields['use_bind'], __('Use bind'), {
helper: __("Indicates whether a simple bind operation should be used during connection to LDAP server. Disabling this behaviour can be required when LDAPS bind is used.")|e('html')
Copy link
Member

Choose a reason for hiding this comment

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

The helper is already in the target macro.

Suggested change
helper: __("Indicates whether a simple bind operation should be used during connection to LDAP server. Disabling this behaviour can be required when LDAPS bind is used.")|e('html')
helper: __("Indicates whether a simple bind operation should be used during connection to LDAP server. Disabling this behaviour can be required when LDAPS bind is used.")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The field helpers allow HTML content, but we wouldn't want to accidentally add HTML content from a localization.


{{ fields.textField('login_field', item.fields['login_field'], __('Login field'), field_options) }}
{{ fields.textField('sync_field', item.fields['sync_field'], __('Synchronization field'), {
helper: __('Synchronization field cannot be changed once in use.')|e('html'),
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
helper: __('Synchronization field cannot be changed once in use.')|e('html'),
helper: __('Synchronization field cannot be changed once in use.'),

src/AuthLDAP.php Outdated Show resolved Hide resolved
js/common.js Outdated Show resolved Hide resolved
@cedric-anne cedric-anne merged commit d656c79 into glpi-project:main Jun 3, 2024
9 checks passed
@cedric-anne cedric-anne added this to the 11.0.0 milestone Jun 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants