Merge pull request #1292 from jumpserver/dev

v2.18

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",

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() {

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
         }
       }
     }

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'