Repository: cloudstack Updated Branches: refs/heads/volume-upload eb180b131 -> 573a4b1e4
volume-upload: tempalates > upload template from local > format dropdown > include OVA, VMDK, BareMetal, TAR, VHDX option. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/573a4b1e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/573a4b1e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/573a4b1e Branch: refs/heads/volume-upload Commit: 573a4b1e433d1919e3e22d54de1f94633c3138e4 Parents: eb180b1 Author: Jessica Wang <jessicaw...@apache.org> Authored: Wed Jan 21 13:44:22 2015 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Wed Jan 21 13:44:22 2015 -0800 ---------------------------------------------------------------------- ui/scripts/templates.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/573a4b1e/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 14b8c39..4a1921f 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -791,12 +791,10 @@ description: 'VHD' }); } else if (args.hypervisor == "VMware") { - /* items.push({ id: 'OVA', description: 'OVA' }); - */ } else if (args.hypervisor == "KVM") { items.push({ id: 'QCOW2', @@ -810,48 +808,40 @@ id: 'VHD', description: 'VHD' }); - /* items.push({ id: 'VMDK', description: 'VMDK' }); - */ - } else if (args.hypervisor == "BareMetal") { - /* + } else if (args.hypervisor == "BareMetal") { items.push({ id: 'BareMetal', description: 'BareMetal' }); - */ } else if (args.hypervisor == "Ovm") { items.push({ id: 'RAW', description: 'RAW' }); - } else if (args.hypervisor == "LXC") { - /* + } else if (args.hypervisor == "LXC") { items.push({ id: 'TAR', description: 'TAR' }); - */ } else if (args.hypervisor == "Hyperv") { items.push({ id: 'VHD', description: 'VHD' }); - /* items.push({ id: 'VHDX', description: 'VHDX' }); - */ } args.response.success({ data: items }); } - }, + }, osTypeId: { label: 'label.os.type',
