Merge release branch 4.8 to master

* 4.8: When no zone name is available display a default
apache · May 11, 2016 · dc5b529 · dc5b529
2 parents 456680d + 72811b4
commit dc5b529
Showing 1 changed file with 3 additions and 0 deletions.
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({