Merge branch '4.11'

rohityadavcloud · rohityadavcloud · commit e4537e9d39f7 · 2018-04-27T12:57:51.000+02:00
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -732,9 +732,9 @@
                                         gateway: args.data.guestGateway
                                     });
                                 }
-                                if (args.data.guestGateway != null && args.data.guestGateway.length > 0) {
+                                if (args.data.guestNetmask != null && args.data.guestNetmask.length > 0) {
                                     $.extend(dataObj, {
-                                        gateway: args.data.guestGateway
+                                        netmask: args.data.guestNetmask
                                     });
                                 }
                                 if (args.data.externalId != null && args.data.externalId.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -732,9 +732,9 @@`
`732`	`732`	`gateway: args.data.guestGateway`
`733`	`733`	`});`
`734`	`734`	`}`
`735`		`- if (args.data.guestGateway != null && args.data.guestGateway.length > 0) {`
	`735`	`+ if (args.data.guestNetmask != null && args.data.guestNetmask.length > 0) {`
`736`	`736`	`$.extend(dataObj, {`
`737`		`- gateway: args.data.guestGateway`
	`737`	`+ netmask: args.data.guestNetmask`
`738`	`738`	`});`
`739`	`739`	`}`
`740`	`740`	`if (args.data.externalId != null && args.data.externalId.length > 0) {`