List all suitable/available zones while creating networks (#873)

Pearl1594 · Pearl Dsilva · yadvr · commit 76f87ff179d7 · 2021-01-20T07:06:23.000+05:30
Co-authored-by: Pearl Dsilva &lt;pearl.dsilva@shapeblue.com&gt;
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue
@@ -329,7 +329,7 @@ export default {
     fetchZoneData () {
       this.zones = []
       const params = {}
-      if (this.resource.zoneid) {
+      if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
         params.id = this.resource.zoneid
       }
       params.listAll = true
diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue
@@ -304,7 +304,7 @@ export default {
     fetchZoneData () {
       this.zones = []
       const params = {}
-      if (this.resource.zoneid) {
+      if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
         params.id = this.resource.zoneid
       }
       params.listAll = true
diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue
@@ -519,7 +519,7 @@ export default {
         }
       } else {
         const params = {}
-        if (this.resource.zoneid) {
+        if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
           params.id = this.resource.zoneid
         }
         params.listAll = true

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ export default {`
`329`	`329`	`fetchZoneData () {`
`330`	`330`	`this.zones = []`
`331`	`331`	`const params = {}`
`332`		`- if (this.resource.zoneid) {`
	`332`	`+ if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {`
`333`	`333`	`params.id = this.resource.zoneid`
`334`	`334`	`}`
`335`	`335`	`params.listAll = true`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ export default {`
`304`	`304`	`fetchZoneData () {`
`305`	`305`	`this.zones = []`
`306`	`306`	`const params = {}`
`307`		`- if (this.resource.zoneid) {`
	`307`	`+ if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {`
`308`	`308`	`params.id = this.resource.zoneid`
`309`	`309`	`}`
`310`	`310`	`params.listAll = true`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ export default {`
`519`	`519`	`}`
`520`	`520`	`} else {`
`521`	`521`	`const params = {}`
`522`		`- if (this.resource.zoneid) {`
	`522`	`+ if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {`
`523`	`523`	`params.id = this.resource.zoneid`
`524`	`524`	`}`
`525`	`525`	`params.listAll = true`