Merge remote-tracking branch 'origin/4.17'

yadvr · yadvr · commit c4ab8fffab7a · 2022-08-08T11:57:37.000+02:00
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -248,7 +248,7 @@ export default {
             if (trafficLabel.length > 0) {
               trafficLabel += ','
             }
-            trafficLabel += trafficConfig.vlanId
+            trafficLabel += trafficConfig.vlanId || ''
           }
           if ('vSwitchType' in trafficConfig) {
             if (trafficLabel.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ export default {`
`248`	`248`	`if (trafficLabel.length > 0) {`
`249`	`249`	`trafficLabel += ','`
`250`	`250`	`}`
`251`		`- trafficLabel += trafficConfig.vlanId`
	`251`	`+ trafficLabel += trafficConfig.vlanId \|\| ''`
`252`	`252`	`}`
`253`	`253`	`if ('vSwitchType' in trafficConfig) {`
`254`	`254`	`if (trafficLabel.length > 0) {`