diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index 96e81abbd..40134de82 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -161,6 +161,7 @@ export default { watch: { url(iNew) { this.$set(this.tableConfig, 'url', iNew) + this.$set(this.headerActions.exportOptions, 'url', iNew.replace('/accounts/', '/account-secrets/')) } }, mounted() { diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue index d86fea912..e543dfe7c 100644 --- a/src/views/accounts/AssetAccount/AssetAccountList.vue +++ b/src/views/accounts/AssetAccount/AssetAccountList.vue @@ -17,7 +17,6 @@ export default { GenericTreeListPage, AccountListTable }, data() { - const vm = this return { isInit: true, clickedRow: null, @@ -30,24 +29,25 @@ export default { url: '/api/v1/assets/accounts/', treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1', callback: { - onSelected: function(event, treeNode) { - let url = '/api/v1/assets/accounts/' - if (treeNode.meta.type === 'node') { - const nodeId = treeNode.meta.data.id - url = setUrlParam(url, 'asset', '') - url = setUrlParam(url, 'node', nodeId) - } else if (treeNode.meta.type === 'asset') { - const assetId = treeNode.meta.data.id - url = setUrlParam(url, 'node', '') - url = setUrlParam(url, 'asset', assetId) - } - setTimeout(() => { - vm.accountsUrl = url - }, 100) - } + onSelected: (event, treeNode) => this.getAccountsUrl(event, treeNode) } } } + }, + methods: { + getAccountsUrl(event, treeNode) { + let url = '/api/v1/assets/accounts/' + if (treeNode.meta.type === 'node') { + const nodeId = treeNode.meta.data.id + url = setUrlParam(url, 'asset', '') + url = setUrlParam(url, 'node', nodeId) + } else if (treeNode.meta.type === 'asset') { + const assetId = treeNode.meta.data.id + url = setUrlParam(url, 'node', '') + url = setUrlParam(url, 'asset', assetId) + } + this.accountsUrl = url + } } } diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue index a01e4e3b7..f1cd58e3e 100644 --- a/src/views/sessions/CommandList.vue +++ b/src/views/sessions/CommandList.vue @@ -209,7 +209,6 @@ export default { const queryStr = (url.indexOf('?') > -1 ? '&' : '?') + queryUtil.stringify(_query, '=', '&') const treeUrl = url + queryStr this.$set(this.treeSetting, 'treeUrl', treeUrl) - this.treeTable.forceRerenderTree() }, handleDateChange(object) { this.query = { diff --git a/src/views/settings/Ldap/ImportDialog.vue b/src/views/settings/Ldap/ImportDialog.vue index c8bc92068..cf474fe5d 100644 --- a/src/views/settings/Ldap/ImportDialog.vue +++ b/src/views/settings/Ldap/ImportDialog.vue @@ -105,11 +105,17 @@ export default { settings: { visible: false, url: '/api/v1/settings/setting/?category=ldap', - fields: ['AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_INTERVAL', 'AUTH_LDAP_SYNC_CRONTAB'], + fields: ['AUTH_LDAP_SYNC_IS_PERIODIC', 'AUTH_LDAP_SYNC_CRONTAB', 'AUTH_LDAP_SYNC_INTERVAL'], fieldsMeta: { + AUTH_LDAP_SYNC_IS_PERIODIC: { + type: 'switch' + }, AUTH_LDAP_SYNC_CRONTAB: { component: CronTab, helpText: this.$t('xpack.HelpText.CrontabOfCreateUpdatePage') + }, + AUTH_LDAP_SYNC_INTERVAL: { + helpText: this.$t('xpack.HelpText.IntervalOfCreateUpdatePage') } }, submitMethod: () => 'patch' diff --git a/src/views/tickets/TicketList.vue b/src/views/tickets/TicketList.vue index 83aa9e86e..ced18c232 100644 --- a/src/views/tickets/TicketList.vue +++ b/src/views/tickets/TicketList.vue @@ -50,7 +50,7 @@ export default { icon: 'fa-gear', name: 'TicketFlow', hidden: () => { - return !(vm.$store.getters.currentUserIsSuperAdmin || vm.$store.getters.currentUserIsAdmin) + return !vm.$store.getters.currentUserIsSuperAdmin } } ]