ui: fix merge issue that causes VR duplicates (#3927)

yadvr · web-flow · commit 8597f37cac8c · 2020-03-04T10:51:02.000+01:00
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
@@ -9996,7 +9996,7 @@
                                             }
 
                                             $.ajax({
-                                                url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
+                                                url: createURL("listRouters&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),
                                                 data: data2,
                                                 async: false,
                                                 success: function (json) {

Original file line number	Diff line number	Diff line change
`@@ -9996,7 +9996,7 @@`
`9996`	`9996`	`}`
`9997`	`9997`
`9998`	`9998`	`$.ajax({`
`9999`		`- url: createURL("listRouters&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),`
	`9999`	`+ url: createURL("listRouters&page=" + args.page + "&pagesize=" + pageSize + array1.join("") + "&projectid=-1"),`
`10000`	`10000`	`data: data2,`
`10001`	`10001`	`async: false,`
`10002`	`10002`	`success: function (json) {`