Skip to content

Commit 079db58

Browse files
committed
Reset domain view and navigate to domain list after deletion
Deletion message which shows actual behavior
1 parent 0ae1d89 commit 079db58

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

ui/public/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2971,7 +2971,7 @@
29712971
"message.delete.account.success": "Successfully deleted account",
29722972
"message.delete.account.warning": "Deleting this account will delete all of the instances, volumes and snapshots associated with the account.",
29732973
"message.delete.domain.confirm": "Please confirm that you want to delete this domain by entering the name of the domain below.",
2974-
"message.delete.domain.warning": "This domain may contain accounts, users, or sub-domains. All of these must be removed before the domain can be deleted. This action cannot be undone.",
2974+
"message.delete.domain.warning": "All associated accounts, users, VMs, and sub-domains will be permanently deleted. This action cannot be undone.",
29752975
"message.delete.domain.failed": "Delete domain failed",
29762976
"message.delete.acl.processing": "Removing ACL rule...",
29772977
"message.delete.acl.rule": "Remove ACL rule",

ui/src/views/iam/DomainView.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,10 +348,14 @@ export default {
348348
successMessage: `${this.$t('label.action.delete.domain')} ${domain.name}`,
349349
catchMessage: this.$t('error.fetching.async.job.result'),
350350
successMethod: () => {
351-
if (this.$route.params.id === domain.id) {
352-
this.$router.push({ path: '/domain' })
353-
}
354-
this.fetchData()
351+
this.$router.replace({ path: '/domain' })
352+
this.resource = {}
353+
this.treeSelected = {}
354+
this.treeDeletedKey = null
355+
this.treeViewKey += 1
356+
this.$nextTick(() => {
357+
this.fetchData()
358+
})
355359
}
356360
})
357361
}).catch(error => {

0 commit comments

Comments
 (0)