diff --git a/src/components/ListTable/formatters/DeleteActionFormatter.vue b/src/components/ListTable/formatters/DeleteActionFormatter.vue index cbc5c310c..40b5c28a2 100644 --- a/src/components/ListTable/formatters/DeleteActionFormatter.vue +++ b/src/components/ListTable/formatters/DeleteActionFormatter.vue @@ -20,7 +20,7 @@ export default { const url = col.deleteUrl + cellValue this.$axios.delete(url).then(res => { this.$message.success(this.$t('common.deleteSuccessMsg')) - reload() + window.location.reload() }).catch(error => { this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error)) }) diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index 00e99e1a1..2ddcb8d97 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -21,7 +21,7 @@ export default { [this.$t('perms.' + 'Basic'), ['name']], [this.$t('perms.' + 'User'), ['users', 'user_groups']], [this.$t('perms.' + 'Asset'), ['assets', 'nodes', 'system_users']], - [this.$t('common.table.Actions'), ['actions']], + [this.$t('common.action'), ['actions']], [this.$t('common.Other'), ['is_active', 'date_expired', 'comment']] ], url: '/api/v1/perms/asset-permissions/', @@ -99,6 +99,12 @@ export default { { label: 'download_file', value: this.$t('perms.downloadFile') } ] }, + date_expired: { + label: this.$t('common.dateExpired') + }, + comment: { + label: this.$t('common.Comment') + }, is_active: { type: 'checkbox' } diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue index 0308fbcdb..dc1eb6503 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue @@ -1,7 +1,7 @@