summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSurya Venkatesan <suryav@ami.com>2024-09-23 13:59:01 +0300
committerSurya Venkatesan <suryav@ami.com>2024-09-30 16:16:34 +0300
commit7ccb77dafe3d7d9f57e6b2dd976658c929140f27 (patch)
treef6ff2379d2a0f35ca0cef8af6c4128bcdecc1324
parentf10883d00705985b1e71e76edf3654148adb31ed (diff)
downloadwebui-vue-7ccb77dafe3d7d9f57e6b2dd976658c929140f27.tar.xz
LDAP and server power operation page fix
In LDAP loading declare outside the form, form validation condition change, server power operation page validation added and i18n method changed in the event log store. Change-Id: I903b4dec7da1a5a2cc8441c65693c57201405d70 Signed-off-by: Surya Venkatesan <suryav@ami.com>
-rw-r--r--src/store/modules/Logs/EventLogStore.js2
-rw-r--r--src/views/Operations/ServerPowerOperations/BootSettings.vue6
-rw-r--r--src/views/SecurityAndAccess/Ldap/Ldap.vue6
3 files changed, 10 insertions, 4 deletions
diff --git a/src/store/modules/Logs/EventLogStore.js b/src/store/modules/Logs/EventLogStore.js
index a83a1335..67407c23 100644
--- a/src/store/modules/Logs/EventLogStore.js
+++ b/src/store/modules/Logs/EventLogStore.js
@@ -236,7 +236,7 @@ const EventLogStore = {
.catch((error) => {
console.log(error);
throw new Error(
- i18n.t('pageEventLogs.toast.errorDownloadEventEntry'),
+ i18n.global.t('pageEventLogs.toast.errorDownloadEventEntry'),
);
});
},
diff --git a/src/views/Operations/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue
index a7bcfaa9..48ce71c6 100644
--- a/src/views/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/Operations/ServerPowerOperations/BootSettings.vue
@@ -54,10 +54,16 @@ import { mapState } from 'vuex';
import BVToastMixin from '@/components/Mixins/BVToastMixin';
import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
import { useI18n } from 'vue-i18n';
+import { useVuelidate } from '@vuelidate/core';
export default {
name: 'BootSettings',
mixins: [BVToastMixin, LoadingBarMixin],
+ setup() {
+ return {
+ v$: useVuelidate(),
+ };
+ },
data() {
return {
$t: useI18n().t,
diff --git a/src/views/SecurityAndAccess/Ldap/Ldap.vue b/src/views/SecurityAndAccess/Ldap/Ldap.vue
index eab2737f..6de491a6 100644
--- a/src/views/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/SecurityAndAccess/Ldap/Ldap.vue
@@ -278,8 +278,8 @@ export default {
baseDn: '',
userIdAttribute: '',
groupIdAttribute: '',
- loading,
},
+ loading,
};
},
computed: {
@@ -390,8 +390,8 @@ export default {
this.form.groupIdAttribute = groupsAttribute;
},
handleSubmit() {
- this.v$.$touch();
- if (this.v$.$invalid) return;
+ this.v$.form.$touch();
+ if (this.v$.form.$invalid) return;
const data = {
serviceEnabled: this.form.ldapAuthenticationEnabled,
activeDirectoryEnabled: this.form.activeDirectoryEnabled,