Skip to content

Commit 5a79c2b

Browse files
committed
Merge pull request #1477 from remibergsma/47_default_zone_name_s3
When no zone name is available display a defaultWhen a zone name is available, the previous behaviour is still there: ![screen shot 2016-03-30 at 21 00 44](https://cloud.githubusercontent.com/assets/1630096/14154026/ba41a4bc-f6ba-11e5-9f88-19cf36bfbd4f.png) When there is no zone name, it used to display an empty name (where you had to click on to see details): ![screen shot 2016-03-30 at 21 03 06](https://cloud.githubusercontent.com/assets/1630096/14154048/d31a7b08-f6ba-11e5-9f67-f716e8d9fbf2.png) With this change, a default name `All` is displayed (because this happens when S3 storage is used that is region wide aka all zones): ![screen shot 2016-03-30 at 20 53 50](https://cloud.githubusercontent.com/assets/1630096/14154060/e20d1d0a-f6ba-11e5-9b0a-1b5e502a2964.png) Region wide S3: ![screen shot 2016-03-30 at 21 04 55](https://cloud.githubusercontent.com/assets/1630096/14154108/2222ff54-f6bb-11e5-845a-c22ddc745b98.png) FYI: Screenshot shows 'All', later renamed to 'All Zones', see code. * pr/1477: When no zone name is available display a default Signed-off-by: Will Stevens <[email protected]>
2 parents 86dfcb2 + aead9f4 commit 5a79c2b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

ui/scripts/templates.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,6 +1427,9 @@
14271427
jsonObj.xenserverToolsVersion61plus = false;
14281428
}
14291429
}
1430+
if (!'zonename' in jsonObj) {
1431+
jsonObj.zonename = 'All Zones';
1432+
}
14301433
}
14311434

14321435
args.response.success({

0 commit comments

Comments
 (0)