cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/3] git commit: updated refs/heads/4.8 to 72811b4
Date Wed, 11 May 2016 05:31:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.8 1c2400f4d -> 72811b405


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.8
Commit: aead9f4ff43ea79107e2b870ab49fcf2f3fd7a0d
Parents: ef115ab
Author: Remi Bergsma <github@remi.nl>
Authored: Thu Apr 7 21:57:17 2016 +0200
Committer: Remi Bergsma <github@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({


Mime
View raw message