Updated Branches: refs/heads/master 38e26f8db -> ccfdb151f
CS-15671: cloudstack 3.0 UI - Migrate SystemVM option, Migrate Router action - host dropdown - listHosts API no longer returns hasEnoughCapacity proprety. So, "Available" or "Full" is removed from dropdown option since "Available" or "Full" is determined by host's hasEnoughCapacity proprety. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ccfdb151 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ccfdb151 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ccfdb151 Branch: refs/heads/master Commit: ccfdb151f142eed0d0ce726843782ed5c319579b Parents: 38e26f8 Author: Jessica Wang <[email protected]> Authored: Mon Aug 27 16:31:10 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Mon Aug 27 16:35:28 2012 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ccfdb151/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 41c7992..ae45f27 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -2160,7 +2160,8 @@ var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); + //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}); }); args.response.success({data: items}); } @@ -2693,7 +2694,8 @@ var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); + //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}); }); args.response.success({data: items}); } @@ -4333,7 +4335,8 @@ var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); + //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}); }); args.response.success({data: items}); } @@ -5071,7 +5074,8 @@ var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); + //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}); }); args.response.success({data: items}); } @@ -5490,7 +5494,8 @@ var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); + //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}); }); args.response.success({data: items}); }
