Merge release branch 4.7 to 4.8

swill · swill · commit 72811b405809 · 2016-05-11T01:31:21.000-04:00
* 4.7:
  When no zone name is available display a default
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
@@ -1427,6 +1427,9 @@
                                                                 jsonObj.xenserverToolsVersion61plus = false;
                                                         }
                                                     }
+                                                    if (!'zonename' in jsonObj) {
+                                                        jsonObj.zonename = 'All Zones';
+                                                    }
                                                 }
 
                                                 args.response.success({

Original file line number	Diff line number	Diff line change
`@@ -1427,6 +1427,9 @@`
`1427`	`1427`	`jsonObj.xenserverToolsVersion61plus = false;`
`1428`	`1428`	`}`
`1429`	`1429`	`}`
	`1430`	`+ if (!'zonename' in jsonObj) {`
	`1431`	`+ jsonObj.zonename = 'All Zones';`
	`1432`	`+ }`
`1430`	`1433`	`}`
`1431`	`1434`
`1432`	`1435`	`args.response.success({`