Merge branch '4.16'

This commit is contained in:
nvazquez 2022-05-03 14:00:16 -03:00
commit 1967b64b2b
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84

View File

@ -459,10 +459,9 @@ export default {
successMethod: result => {
if (singleZone) {
const isResourcePage = (this.$route.params && this.$route.params.id)
if (isResourcePage) {
if (this.selectedItems.length === 0 && !this.showGroupActionModal) {
this.$router.push({ path: '/template' })
}
const isSameResource = isResourcePage && this.$route.params.id === result.jobinstanceid
if (isResourcePage && isSameResource && this.selectedItems.length === 0 && !this.showGroupActionModal) {
this.$router.push({ path: '/template' })
}
} else {
if (this.selectedItems.length === 0) {