Merge release branch 4.7 to 4.8

* 4.7: When no zone name is available display a default
2016-05-11 01:31:21 -04:00 · 2016-05-11 01:31:21 -04:00 · 72811b4058
parent 1c2400f4d8 5a79c2b6f5
commit 72811b4058
1 changed files with 3 additions and 0 deletions
--- 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({