Updated Branches: refs/heads/master 14782dbc2 -> 45681c57f
CLOUDSTACK-2029:Zone wide primary storage for VMware Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45681c57 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45681c57 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45681c57 Branch: refs/heads/master Commit: 45681c57f6dc77423100b732a73b524c3bf818b1 Parents: 14782db Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Mon Jun 3 17:03:07 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Mon Jun 3 17:03:07 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45681c57/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3044c83..ba7168b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -11346,6 +11346,7 @@ $form.find('.form-item[rel=podId]').hide(); $form.find('.form-item[rel=clusterId]').hide(); $form.find('.form-item[rel=hostId]').hide(); + $form.find('.form-item[rel=hypervisor]').css('display', 'inline-block'); } @@ -11355,6 +11356,7 @@ $form.find('.form-item[rel=hostId]').hide(); $form.find('.form-item[rel=podId]').css('display', 'inline-block'); $form.find('.form-item[rel=clusterId]').css('display', 'inline-block'); + $form.find('.form-item[rel=hypervisor]').hide(); } @@ -11363,6 +11365,8 @@ $form.find('.form-item[rel=podId]').css('display', 'inline-block'); $form.find('.form-item[rel=clusterId]').css('display', 'inline-block'); $form.find('.form-item[rel=hostId]').css('display', 'inline-block'); + $form.find('.form-item[rel=hypervisor]').hide(); + } @@ -11370,6 +11374,23 @@ } }, + + + hypervisor:{ + label:'Hypervisor', + isHidden:true, + select:function(args){ + var items=[]; + items.push({ id: 'KVM', description: _l('KVM') }); + items.push({ id: 'VMWARE', description: _l('VMware') }); + + args.response.success({ + data: items + }); + + } + }, + zoneid: { label: 'Zone', docID: 'helpPrimaryStorageZone', @@ -11858,6 +11879,11 @@ array1.push("&scope=" + todb(args.data.scope)); array1.push("&zoneid=" + args.data.zoneid); + + if(args.data.scope == 'zone'){ + + array1.push("&hypervisor=" + args.data.hypervisor); + } if(args.data.scope == 'cluster'){
