From 5c2266d4301fa90491e6ac551f8734bf3a12fdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Tue, 27 Feb 2024 09:12:04 +0100 Subject: [PATCH 1/2] IBX-7540: [Password reset form] Buttons to clear input and discover password does not work --- src/bundle/Resources/encore/ibexa.js.config.js | 3 +++ .../views/themes/admin/account/reset_password/index.html.twig | 1 + 2 files changed, 4 insertions(+) diff --git a/src/bundle/Resources/encore/ibexa.js.config.js b/src/bundle/Resources/encore/ibexa.js.config.js index 45a476e77d..d06e0e9497 100644 --- a/src/bundle/Resources/encore/ibexa.js.config.js +++ b/src/bundle/Resources/encore/ibexa.js.config.js @@ -246,6 +246,9 @@ module.exports = (Encore) => { path.resolve(__dirname, '../public/js/scripts/admin.input.text.js'), path.resolve(__dirname, '../public/js/scripts/login.js'), ]) + .addEntry('ibexa-admin-ui-reset-password-js', [ + path.resolve(__dirname, '../public/js/scripts/admin.input.text.js'), + ]) .addEntry('ibexa-admin-ui-user-invitation-modal', [path.resolve(__dirname, '../public/js/scripts/user.invitation.modal.js')]) .addEntry('ibexa-admin-ui-tabs-js', [ path.resolve(__dirname, '../public/js/scripts/admin.location.tab.js'), diff --git a/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig index 6006e0d084..f8c0c875b2 100644 --- a/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig @@ -13,4 +13,5 @@ {{ form_end(form_reset_user_password) }} {% endif %} + {{ encore_entry_script_tags('ibexa-admin-ui-reset-password-js', null, 'ibexa') }} {%- endblock content -%} From 2ec82a98028ffa8ddd4a52857ac1ea1f2a27d4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Tue, 27 Feb 2024 09:55:23 +0100 Subject: [PATCH 2/2] linter --- src/bundle/Resources/encore/ibexa.js.config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bundle/Resources/encore/ibexa.js.config.js b/src/bundle/Resources/encore/ibexa.js.config.js index d06e0e9497..b7dad2f5af 100644 --- a/src/bundle/Resources/encore/ibexa.js.config.js +++ b/src/bundle/Resources/encore/ibexa.js.config.js @@ -246,9 +246,7 @@ module.exports = (Encore) => { path.resolve(__dirname, '../public/js/scripts/admin.input.text.js'), path.resolve(__dirname, '../public/js/scripts/login.js'), ]) - .addEntry('ibexa-admin-ui-reset-password-js', [ - path.resolve(__dirname, '../public/js/scripts/admin.input.text.js'), - ]) + .addEntry('ibexa-admin-ui-reset-password-js', [path.resolve(__dirname, '../public/js/scripts/admin.input.text.js')]) .addEntry('ibexa-admin-ui-user-invitation-modal', [path.resolve(__dirname, '../public/js/scripts/user.invitation.modal.js')]) .addEntry('ibexa-admin-ui-tabs-js', [ path.resolve(__dirname, '../public/js/scripts/admin.location.tab.js'),