cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [2/3] git commit: updated refs/heads/master to fc1a09f
Date Thu, 04 Dec 2014 14:32:46 GMT
[UI] bug fix: the host uuid is wrong if it is dedicated to a domain


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

Branch: refs/heads/master
Commit: 4608053ed7ccd03136a60ea5ce4aa582a3e23fcb
Parents: d460555
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Thu Dec 4 15:28:57 2014 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Thu Dec 4 15:28:57 2014 +0100

----------------------------------------------------------------------
 ui/scripts/system.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4608053e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 58b7a53..57150c7 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -16149,8 +16149,9 @@
                                                     if (json.listdedicatedhostsresponse.dedicatedhost
!= undefined) {
                                                         var hostItem = json.listdedicatedhostsresponse.dedicatedhost[0];
                                                         if (hostItem.domainid != null) {
-                                                            $.extend(item, hostItem, {
-                                                                isdedicated: _l('label.yes')
+                                                            $.extend(item, {
+                                                                isdedicated: _l('label.yes'),
+                                                                domainid: hostItem.domainid
                                                             });
                                                         }
                                                     } else


Mime
View raw message