Merge branch 'dev' of github.com:jumpserver/lina into dev

src/userviews/apps/DatabaseApp.vue

@@ -58,15 +58,7 @@ export default {
                   fa: 'fa-terminal',
                   type: 'primary',
                   callback: function({ row, col, cellValue, reload }) {
-                    window.open(`/luna/?type=remote_app&login_to=${cellValue}`, '_blank')
-                  }
-                },
-                {
-                  name: 'favor',
-                  type: 'info',
-                  fa: 'fa-star-o',
-                  callback: function({ row, col, cellValue, reload }) {
-                    window.open(`/luna/?type=remote_app&login_to=${cellValue}`, '_blank')
+                    window.open(`/luna/?type=database_app&login_to=${cellValue}`, '_blank')
                   }
                 }
               ]

src/userviews/apps/RemoteApp.vue

@@ -59,14 +59,6 @@ export default {
                   callback: function({ row, col, cellValue, reload }) {
                     window.open(`/luna/?type=remote_app&login_to=${cellValue}`, '_blank')
                   }
-                },
-                {
-                  name: 'favor',
-                  type: 'info',
-                  fa: 'fa-star-o',
-                  callback: function({ row, col, cellValue, reload }) {
-                    window.open(`/luna/?type=remote_app&login_to=${cellValue}`, '_blank')
-                  }
                 }
               ]
             }

src/views/ops/CommandExecution.vue

@@ -141,12 +141,12 @@ export default {
       this.actions = val
     },
     onClick(event, treeId, treeNode, clickFlag) {
-      if (treeNode.meta.type === 'asset') {
-        const protocolsStr = treeNode.meta.asset.protocols + ''
-        if (protocolsStr.indexOf('ssh/') === -1) {
-          // Don't Support SSH
-        }
-      }
+      // if (treeNode.meta.type === 'asset') {
+      //   const protocolsStr = treeNode.meta.asset.protocols + ''
+      //   if (protocolsStr.indexOf('ssh/') === -1) {
+      //     // Don't Support SSH
+      //   }
+      // }
     },
     handleSystemUserChange(id) {
       this.treeSetting.treeUrl = `${this.basicUrl}&system_user=${id}`

src/views/perms/AssetPermission/AssetPermissionList.vue

@@ -99,11 +99,11 @@ export default {
               children: [
                 {
                   value: '1',
-                  label: this.$t('common.Validity')
+                  label: this.$t('common.Yes')
                 },
                 {
                   value: '0',
-                  label: this.$t('common.Invalidity')
+                  label: this.$t('common.No')
                 }
               ]
             },

src/views/settings/Ldap.vue

@@ -147,18 +147,10 @@ export default {
               value['AUTH_LDAP_BIND_PASSWORD'] = ''
             }
             testLdapSetting(value).then(resp => {
-              this.$notify({
-                message: resp,
-                type: 'success',
-                duration: 4500
-              })
+              this.$message.success(resp)
             }).catch(err => {
               const response = err.response
-              this.$notify({
-                message: response.data,
-                type: 'error',
-                duration: 4500
-              })
+              this.$message.error(response.data)
             })
           }.bind(this)
         },
@@ -172,7 +164,6 @@ export default {
           title: this.$t('setting.ldapBulkImport'),
           callback: function(value, form) {
             this.dialogLdapUserImport = true
-            this.$refs.listTable.reloadTable()
           }.bind(this)
         }
       ],
@@ -201,12 +192,7 @@ export default {
             can: true,
             callback: function() {
               refreshLdapUserCache().then(res => {
-                this.$notify({
-                  message: res.msg,
-                  type: 'success',
-                  duration: 4500
-                })
-                setTimeout(this.$refs.listTable.reloadTable, 500)
+                this.$message.success(res.msg)
               })
             }.bind(this)
           }
@@ -238,18 +224,10 @@ export default {
     },
     testUerLoginClick() {
       testLdapUserLogin(this.userLoginForm).then(res => {
-        this.$notify({
-          message: res,
-          type: 'success',
-          duration: 4500
-        })
+        this.$message.success(res)
       }).catch(err => {
         const response = err.response
-        this.$notify({
-          message: response.data,
-          type: 'error',
-          duration: 4500
-        })
+        this.$message.error(response.data)
       })
     },
     importUserClick() {
@@ -259,22 +237,12 @@ export default {
         username_list: selectIds
       }
       importLdapUser(data).then(res => {
-        this.$notify({
-          message: res.msg,
-          type: 'success',
-          duration: 4500
-        })
+        this.$message.success(res.msg)
       })
     },
     handlerListTableXHRError(errMsg) {
-      const response = errMsg.response
       if (this.dialogLdapUserImport) {
-        this.$notify({
-          message: response.data.msg,
-          type: 'error',
-          duration: 4500
-        })
-        setTimeout(this.$refs.listTable.reloadTable, 1000)
+        setTimeout(this.$refs.listTable.reloadTable, 3000)
       }
     }
   }

src/views/users/User/UserDetail/UserAssetPermissionRules.vue

@@ -24,7 +24,7 @@ export default {
         hasTree: true,
         columns: [
           'name', 'users_amount', 'user_groups_amount', 'assets_amount',
-          'nodes_amount', 'system_users_amount', 'is_active', 'actions'
+          'nodes_amount', 'system_users_amount', 'is_valid', 'actions'
         ],
         columnsMeta: {
           name: {
@@ -82,11 +82,11 @@ export default {
               children: [
                 {
                   value: '1',
-                  label: this.$t('common.Validity')
+                  label: this.$t('common.Yes')
                 },
                 {
                   value: '0',
-                  label: this.$t('common.Invalidity')
+                  label: this.$t('common.No')
                 }
               ]
             },