apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove deploy as is option from the old UI

Browse Source
This commit is contained in:
nvazquez 2020-10-08 15:03:18 -03:00 committed by Harikrishna Patnala
parent dc4f913afa
commit cee71c67ea
3 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/l10n/en.js
View File

@ -674,7 +674,6 @@ var dictionary = {
"label.deleting.processing":"Deleting....", "label.deleting.processing":"Deleting....",
"label.deny":"Deny", "label.deny":"Deny",
"label.deployment.planner":"Deployment planner", "label.deployment.planner":"Deployment planner",
"label.deploy.as.is":"Deploy As-Is",
"label.description":"Description", "label.description":"Description",
"label.destination.physical.network.id":"Destination physical network ID", "label.destination.physical.network.id":"Destination physical network ID",
"label.destination.zone":"Destination Zone", "label.destination.zone":"Destination Zone",

4
ui/scripts/docs.js
View File

@ -1243,10 +1243,6 @@ cloudStack.docs = {
desc: 'The Management Server will download the file from the specified URL, such as http://my.web.server/filename.vhd.gz', desc: 'The Management Server will download the file from the specified URL, such as http://my.web.server/filename.vhd.gz',
externalLink: '' externalLink: ''
}, },
helpRegisterTemplateDeployAsIs: {
desc: 'Vmware Only: Deploy with specifications from OVF instead of orchestrated specs',
externalLink: ''
},
helpRegisterTemplateDirectDownload: { helpRegisterTemplateDirectDownload: {
desc: 'KVM Only: Secondary Storage is bypassed and template/ISO is downloaded to Primary Storage on deployment', desc: 'KVM Only: Secondary Storage is bypassed and template/ISO is downloaded to Primary Storage on deployment',
externalLink: '' externalLink: ''

38
ui/scripts/templates.js
View File

@ -245,10 +245,9 @@
args.$select.change(function() { args.$select.change(function() {
var $form = $(this).closest('form'); var $form = $(this).closest('form');
if ($(this).val() == "VMware") { if ($(this).val() == "VMware") {
$form.find('.form-item[rel=rootDiskControllerType]').css('display', 'inline-block'); $form.find('.form-item[rel=rootDiskControllerType]').hide();
$form.find('.form-item[rel=nicAdapterType]').css('display', 'inline-block'); $form.find('.form-item[rel=nicAdapterType]').hide();
$form.find('.form-item[rel=keyboardType]').css('display', 'inline-block'); $form.find('.form-item[rel=keyboardType]').css('display', 'inline-block');
$form.find('.form-item[rel=deployAsIs]').css('display', 'inline-block');
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
$form.find('.form-item[rel=directdownload]').hide(); $form.find('.form-item[rel=directdownload]').hide();
@ -259,7 +258,6 @@
$form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=keyboardType]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
$form.find('.form-item[rel=directdownload]').hide(); $form.find('.form-item[rel=directdownload]').hide();
$form.find('.form-item[rel=deployAsIs]').hide();
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
if (isAdmin()) { if (isAdmin()) {
@ -270,7 +268,6 @@
$form.find('.form-item[rel=nicAdapterType]').hide(); $form.find('.form-item[rel=nicAdapterType]').hide();
$form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=keyboardType]').hide();
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
$form.find('.form-item[rel=deployAsIs]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block'); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block');
$('#label_root_disk_controller').prop('selectedIndex', 2); $('#label_root_disk_controller').prop('selectedIndex', 2);
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
@ -284,7 +281,6 @@
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
$form.find('.form-item[rel=directdownload]').hide(); $form.find('.form-item[rel=directdownload]').hide();
$form.find('.form-item[rel=deployAsIs]').hide();
$form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block');
} }
}); });
@ -467,13 +463,6 @@
}); });
} }
}, },
deployAsIs : {
label: 'label.deploy.as.is',
docID: 'helpRegisterTemplateDeployAsIs',
isBoolean: true,
dependsOn: 'hypervisor',
isHidden: true
},
// fields for hypervisor == "VMware" (ends here) // fields for hypervisor == "VMware" (ends here)
format: { format: {
@ -694,11 +683,6 @@
'details[0].keyboard': args.data.keyboardType 'details[0].keyboard': args.data.keyboardType
}); });
} }
if (args.$form.find('.form-item[rel=deployAsIs]').css("display") != "none" && args.data.deployAsIs != "") {
$.extend(data, {
deployAsIs: (args.data.deployAsIs == "on") ? "true" : "false"
});
}
// for hypervisor == VMware (ends here) // for hypervisor == VMware (ends here)
$.ajax({ $.ajax({
@ -1924,11 +1908,6 @@
isBoolean: true, isBoolean: true,
converter: cloudStack.converters.toBooleanText converter: cloudStack.converters.toBooleanText
}, },
deployAsIs: {
label: 'label.deploy.as.is',
isBoolean: true,
converter: cloudStack.converters.toBooleanText
},
isextractable: { isextractable: {
label: 'label.extractable.lower', label: 'label.extractable.lower',
isBoolean: true, isBoolean: true,
@ -2811,11 +2790,6 @@
docID: 'helpRegisterISOFeatured', docID: 'helpRegisterISOFeatured',
isBoolean: true, isBoolean: true,
isHidden: true isHidden: true
},
deployAsIs : {
label: 'label.deploy.as.is',
docID: 'helpRegisterTemplateDeployAsIs',
isBoolean: true
} }
} }
}, },
@ -2829,8 +2803,7 @@
zoneid: args.data.zone, zoneid: args.data.zone,
isextractable: (args.data.isExtractable == "on"), isextractable: (args.data.isExtractable == "on"),
bootable: (args.data.isBootable == "on"), bootable: (args.data.isBootable == "on"),
directdownload: (args.data.directdownload == "on"), directdownload: (args.data.directdownload == "on")
deployAsIs: (args.data.deployAsIs == "on")
}; };
if (args.$form.find('.form-item[rel=osTypeId]').css("display") != "none") { if (args.$form.find('.form-item[rel=osTypeId]').css("display") != "none") {
@ -3667,11 +3640,6 @@
isBoolean: true, isBoolean: true,
converter: cloudStack.converters.toBooleanText converter: cloudStack.converters.toBooleanText
}, },
deployAsIs: {
label: 'label.deploy.as.is',
isBoolean: true,
converter: cloudStack.converters.toBooleanText
},
size: { size: {
label: 'label.size', label: 'label.size',
converter: function(args) { converter: function(args) {