[cloudstack] branch 4.17 updated: UI fix message.add.vpn.customer.gateway.failed when catched error (#6493)

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.17 by this push:
     new aee7bb9e34 UI fix message.add.vpn.customer.gateway.failed when catched error (#6493)
aee7bb9e34 is described below

commit aee7bb9e342832d4a9da9177bb7296cf8423848f
Author: hooklee2000 <52...@users.noreply.github.com>
AuthorDate: Tue Jun 28 13:23:25 2022 +0800

    UI fix message.add.vpn.customer.gateway.failed when catched error (#6493)
    
    * UI fix message.add.vpn.customer.gateway.failed when catched error
    
    * fix UI VPC add ACL  without required input  close ui
    
    Without any input, click ok button then close the ui . We need display ui to confirm all required input.
    
    * remove commented line
---
 ui/src/views/network/CreateVpnCustomerGateway.vue | 2 +-
 ui/src/views/network/VpcTab.vue                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/network/CreateVpnCustomerGateway.vue b/ui/src/views/network/CreateVpnCustomerGateway.vue
index 7144e273bd..b890e2968a 100644
--- a/ui/src/views/network/CreateVpnCustomerGateway.vue
+++ b/ui/src/views/network/CreateVpnCustomerGateway.vue
@@ -341,7 +341,7 @@ export default {
           this.formRef.value.resetFields()
         }).catch(error => {
           console.error(error)
-          this.$message.error(this.$t('message.success.add.vpn.customer.gateway'))
+          this.$message.error(this.$t('message.add.vpn.customer.gateway.failed'))
           this.isSubmitted = false
         })
       }).catch(error => {
diff --git a/ui/src/views/network/VpcTab.vue b/ui/src/views/network/VpcTab.vue
index 2aee72cd43..0183764562 100644
--- a/ui/src/views/network/VpcTab.vue
+++ b/ui/src/views/network/VpcTab.vue
@@ -822,7 +822,6 @@ export default {
     handleNetworkAclFormSubmit () {
       if (this.fetchLoading) return
       this.fetchLoading = true
-      this.modals.networkAcl = false
 
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
@@ -852,6 +851,7 @@ export default {
         }).catch(error => {
           this.$notifyError(error)
         }).finally(() => {
+          this.modals.networkAcl = false
           this.fetchLoading = false
           this.fetchAclList()
         })