From 00b1485ce6b7b7cf4b29ff6251ef9d58c62f9e94 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Fri, 20 Sep 2024 17:12:47 +0200 Subject: [PATCH] WIP7 Signed-off-by: Louis Chemineau --- apps/user_ldap/lib/Settings/Admin.php | 2 +- .../components/SettingsTabs/AdvancedTab.vue | 7 ++- .../src/components/SettingsTabs/ExpertTab.vue | 7 ++- .../src/components/SettingsTabs/GroupsTab.vue | 10 ++-- .../src/components/SettingsTabs/LoginTab.vue | 11 ++-- .../src/components/SettingsTabs/ServerTab.vue | 24 +++++---- .../src/components/SettingsTabs/UsersTab.vue | 10 ++-- .../src/components/WizardControls.vue | 10 ++-- .../src/services/ldapConfigService.ts | 30 +++++++---- apps/user_ldap/src/store/configs.ts | 28 +++++----- apps/user_ldap/src/store/wizard.ts | 4 +- apps/user_ldap/src/views/Settings.vue | 54 +++++++++---------- 12 files changed, 113 insertions(+), 84 deletions(-) diff --git a/apps/user_ldap/lib/Settings/Admin.php b/apps/user_ldap/lib/Settings/Admin.php index f3fe9325916..c609a9e48de 100644 --- a/apps/user_ldap/lib/Settings/Admin.php +++ b/apps/user_ldap/lib/Settings/Admin.php @@ -70,7 +70,7 @@ class Admin implements IDelegatedSettings { } $this->InitialState->provideInitialState('ldapConfigs', $ldapConfigs); - $this->InitialState->provideInitialState('ldapDefaultConfig', $defaults); + $this->InitialState->provideInitialState('ldapModuleInstalled', function_exists('ldap_connect')); return new TemplateResponse('user_ldap', 'settings', $parameters); } diff --git a/apps/user_ldap/src/components/SettingsTabs/AdvancedTab.vue b/apps/user_ldap/src/components/SettingsTabs/AdvancedTab.vue index aad72231f47..d9e40c2faef 100644 --- a/apps/user_ldap/src/components/SettingsTabs/AdvancedTab.vue +++ b/apps/user_ldap/src/components/SettingsTabs/AdvancedTab.vue @@ -219,12 +219,15 @@ diff --git a/apps/user_ldap/src/components/SettingsTabs/ExpertTab.vue b/apps/user_ldap/src/components/SettingsTabs/ExpertTab.vue index bc58e05781d..f2cbf6f8813 100644 --- a/apps/user_ldap/src/components/SettingsTabs/ExpertTab.vue +++ b/apps/user_ldap/src/components/SettingsTabs/ExpertTab.vue @@ -40,12 +40,15 @@