Merge pull request #912 from jumpserver/dev

v2.12.0 rc5

src/components/AccountListTable/index.vue

@@ -8,7 +8,7 @@
 
 <script>
 import ListTable from '@/components/ListTable/index'
-import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
+import { ActionsFormatter, DetailFormatter, DisplayFormatter } from '@/components/TableFormatters'
 import ShowSecretInfo from './ShowSecretInfo'
 import UpdateSecretInfo from './UpdateSecretInfo'
 import { connectivityMeta } from './const'
@@ -53,7 +53,7 @@ export default {
         url: this.url,
         columns: [
           'hostname', 'ip', 'username', 'version', 'connectivity',
-          'date_created', 'date_updated', 'actions'
+          'systemuser', 'date_created', 'date_updated', 'actions'
         ],
         columnsShow: {
           min: ['username', 'actions'],
@@ -80,6 +80,9 @@ export default {
           username: {
             showOverflowTooltip: true
           },
+          systemuser: {
+            formatter: DisplayFormatter
+          },
           version: {
             width: '70px'
           },

src/components/TableFormatters/ChoicesFormatter.vue

@@ -41,7 +41,6 @@ export default {
   computed: {
     iconClass() {
       const key = this.formatterArgs.getIconKey({ row: this.row, cellValue: this.cellValue })
-      console.log('What key: ', key)
       return this.formatterArgs.iconChoices[key]
     },
     tips() {

src/views/acl/AssetAcl/AssetAclList.vue

@@ -13,10 +13,17 @@ export default {
     return {
       tableConfig: {
         url: '/api/v1/acls/login-asset-acls/',
-        columns: ['name', 'user_username_group', 'hostname_group', 'ip_group', 'name_group', 'protocol_group', 'systemuser_username_group', 'reviewers', 'priority', 'is_active', 'comment', 'actions'],
+        columns: [
+          'name', 'user_username_group', 'hostname_group', 'ip_group', 'name_group',
+          'protocol_group', 'systemuser_username_group', 'reviewers', 'priority',
+          'is_active', 'comment', 'actions'
+        ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'user_username_group', 'hostname_group', 'ip_group', 'reviewers', 'priority', 'is_active', 'comment', 'actions']
+          default: [
+            'name', 'user_username_group', 'hostname_group', 'ip_group', 'reviewers',
+            'priority', 'is_active', 'comment', 'actions'
+          ]
         },
         columnsMeta: {
           user_username_group: {

src/views/assets/Asset/AssetDetail/Detail.vue

@@ -91,24 +91,6 @@ export default {
             }.bind(this)
           }
         }
-        // {
-        //   title: this.$t('assets.PushSystemUserNow'),
-        //   attrs: {
-        //     type: 'primary',
-        //     label: this.$t('assets.Push')
-        //   },
-        //   callbacks: {
-        //     click: function() {
-        //       this.$axios.post(
-        //         `api/v1/assets/system-users/${this.object.id}/tasks/`,
-        //         { action: 'push' }
-        //       ).then(res => {
-        //         window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
-        //       }
-        //       )
-        //     }.bind(this)
-        //   }
-        // }
       ],
       nodeRelationConfig: {
         icon: 'fa-info',

src/views/assets/SystemUser/SystemUserDetail/index.vue

@@ -48,8 +48,8 @@ export default {
               name: routeName,
               params: { id: id },
               query: {
-                protocol: vm.systemUser.protocol,
-                type: vm.systemUser.type
+                type: vm.systemUser.type,
+                protocol: vm.systemUser.protocol
               }
             })
           }