You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2013/04/17 15:08:45 UTC
git commit: updated refs/heads/master to ff4b55f
Updated Branches:
refs/heads/master d0a7eae5d -> ff4b55fff
Fix CLOUDSTACK-1852 showing disconnected host as suitable target during system vms migration
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ff4b55ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff4b55ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff4b55ff
Branch: refs/heads/master
Commit: ff4b55fff8b93d5e56acad2b1b059bd8ee55cbf4
Parents: d0a7eae
Author: Mice Xia <mi...@tcloudcomputing.com>
Authored: Wed Apr 17 21:06:38 2013 +0800
Committer: Mice Xia <mi...@tcloudcomputing.com>
Committed: Wed Apr 17 21:08:34 2013 +0800
----------------------------------------------------------------------
ui/scripts/system.js | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff4b55ff/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index dbe177a..73bf3fd 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2410,15 +2410,13 @@
select: function(args) {
$.ajax({
url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id),
- //url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json",
async: true,
success: function(json) {
var hostObjs = json.listhostsresponse.host;
var items = [];
$(hostObjs).each(function() {
- //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety
- items.push({id: this.id, description: this.name});
+ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")});
});
args.response.success({data: items});
}
@@ -2986,15 +2984,13 @@
select: function(args) {
$.ajax({
url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id),
- //url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json",
async: true,
success: function(json) {
var hostObjs = json.listhostsresponse.host;
var items = [];
$(hostObjs).each(function() {
- //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety
- items.push({id: this.id, description: this.name});
+ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")});
});
args.response.success({data: items});
}
@@ -5272,15 +5268,13 @@
select: function(args) {
$.ajax({
url: createURL("listHosts&VirtualMachineId=" + args.context.systemVMs[0].id),
- //url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json",
async: true,
success: function(json) {
var hostObjs = json.listhostsresponse.host;
var items = [];
$(hostObjs).each(function() {
- //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety
- items.push({id: this.id, description: this.name});
+ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")});
});
args.response.success({data: items});
}
@@ -6011,15 +6005,13 @@
select: function(args) {
$.ajax({
url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id),
- //url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json",
async: true,
success: function(json) {
var hostObjs = json.listhostsresponse.host;
var items = [];
$(hostObjs).each(function() {
- //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety
- items.push({id: this.id, description: this.name});
+ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")});
});
args.response.success({data: items});
}
@@ -6473,15 +6465,13 @@
select: function(args) {
$.ajax({
url: createURL("listHosts&VirtualMachineId=" + args.context.systemVMs[0].id),
- //url: createURL("listHosts"), //for testing only, comment it out before checking in.
dataType: "json",
async: true,
success: function(json) {
var hostObjs = json.listhostsresponse.host;
var items = [];
$(hostObjs).each(function() {
- //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety
- items.push({id: this.id, description: this.name});
+ items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")});
});
args.response.success({data: items});
}