[1/2] git commit: updated refs/heads/4.7 to 5a79c2b

[sw...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/4.7 86dfcb2a0 -> 5a79c2b6f


When no zone name is available display a default

Backport from Cosmic


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aead9f4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aead9f4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aead9f4f

Branch: refs/heads/4.7
Commit: aead9f4ff43ea79107e2b870ab49fcf2f3fd7a0d
Parents: ef115ab
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Apr 7 21:57:17 2016 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Apr 7 21:57:17 2016 +0200

----------------------------------------------------------------------
 ui/scripts/templates.js | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aead9f4f/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index c8c5b89..0e24c0b 100644
--- 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({

[2/2] git commit: updated refs/heads/4.7 to 5a79c2b

[sw...@apache.org]

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 <wi...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a79c2b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a79c2b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a79c2b6

Branch: refs/heads/4.7
Commit: 5a79c2b6f50b6d6d3aa07aa437a48d303717fd9e
Parents: 86dfcb2 aead9f4
Author: Will Stevens <wi...@gmail.com>
Authored: Wed May 11 01:30:43 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed May 11 01:30:44 2016 -0400

----------------------------------------------------------------------
 ui/scripts/templates.js | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a79c2b6/ui/scripts/templates.js
----------------------------------------------------------------------