diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 43c28f0f2..e13ef6d3d 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -652,7 +652,7 @@ "Assets": "Assets", "Audits": "Audits", "BatchCommand": "Batch Command", - "BatchCommandLog": "Batch Command Log", + "BatchCommandLog": "Batch Command Logs", "CeleryTaskLog": "Celery task log", "CommandExecutions": "CommandExecutions ", "CommandFilterCreate": "Command filter create", diff --git a/src/userviews/users/UserProfile/ProfileInfo.vue b/src/userviews/users/UserProfile/ProfileInfo.vue index 5777e7028..7a98b6758 100644 --- a/src/userviews/users/UserProfile/ProfileInfo.vue +++ b/src/userviews/users/UserProfile/ProfileInfo.vue @@ -115,8 +115,7 @@ export default { title: this.$t('users.SetMFA'), attrs: { type: 'primary', - label: this.$t('common.Setting'), - disabled: this.object.mfa_force_enabled + label: this.$t('common.Setting') }, callbacks: { click: function() { diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue index 5cafdbba6..a59e74324 100644 --- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue +++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue @@ -6,7 +6,7 @@ import { GenericListTable } from '@/layout/components' import { DetailFormatter } from '@/components/TableFormatters' import { openTaskPage } from '@/utils/jms' -import { DATABASE } from '@/views/perms/const' +import { AppPlanDatabase } from '@/views/perms/const' export default { name: 'AppChangeAuthPlanList', @@ -126,7 +126,7 @@ export default { type: option.name.toLowerCase() }}) }, - dropdown: DATABASE + dropdown: AppPlanDatabase } } } diff --git a/src/views/perms/const.js b/src/views/perms/const.js index f9fb44019..e851e9725 100644 --- a/src/views/perms/const.js +++ b/src/views/perms/const.js @@ -97,6 +97,45 @@ export const DATABASE = [ } ] +export const AppPlanDatabase = [ + { + name: MYSQL, + title: i18n.t(`applications.applicationsType.${MYSQL}`), + type: 'primary', + category: DATABASE_CATEGORY, + has: true, + group: i18n.t('applications.RDBProtocol') + }, + { + name: ORACLE, + title: i18n.t(`applications.applicationsType.${ORACLE}`), + type: 'primary', + category: DATABASE_CATEGORY, + has: hasLicence + }, + { + name: POSTGRESQL, + title: i18n.t(`applications.applicationsType.${POSTGRESQL}`), + type: 'primary', + category: DATABASE_CATEGORY, + has: hasLicence + }, + { + name: MARIADB, + title: i18n.t(`applications.applicationsType.${MARIADB}`), + type: 'primary', + category: DATABASE_CATEGORY, + has: hasLicence + }, + { + name: SQLSERVER, + title: i18n.t(`applications.applicationsType.${SQLSERVER}`), + type: 'primary', + category: DATABASE_CATEGORY, + has: hasLicence + } +] + export const KUBERNETES = 'k8s' export const CLOUD_CATEGORY = 'cloud'