etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1756 from yvsubhash/CLOUDSTACK-9585 

CLOUDSTACK-9585 UI doesn't give an option to select the xentools version
This commit is contained in:
Rajani Karuturi 2017-06-06 16:14:29 +05:30 committed by GitHub
parent b9ddf5a9fe 553eadcd7a
commit 44f38eae6a
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/instances.js
View File

@ -2263,7 +2263,7 @@
if (isAdmin()) {
hiddenFields = [];
} else {
hiddenFields = ["hypervisor", 'xenserverToolsVersion61plus'];
hiddenFields = ["hypervisor"];
}
if ('instances' in args.context && args.context.instances[0].hypervisor != 'XenServer') {
@ -2381,12 +2381,7 @@
xenserverToolsVersion61plus: {
label: 'label.Xenserver.Tools.Version61plus',
isBoolean: true,
isEditable: function () {
if (isAdmin())
return true;
else
return false;
},
isEditable: true,
converter: cloudStack.converters.toBooleanText
},

1
ui/scripts/sharedFunctions.js
View File

@ -932,7 +932,6 @@ cloudStack.preFilter = {
args.$form.find('.form-item[rel=isPublic]').hide();
}
args.$form.find('.form-item[rel=isFeatured]').hide();
args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
}
},
addLoadBalancerDevice: function(args) { //add netscaler device OR add F5 device

5
ui/scripts/storage.js
View File

@ -1289,9 +1289,8 @@
desc: '',
preFilter: function(args) {
if (args.context.volumes[0].hypervisor == "XenServer") {
if (isAdmin()) {
args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block');
}
args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block');
}
},
fields: {

9
ui/scripts/templates.js
View File

@ -252,12 +252,11 @@
$form.find('.form-item[rel=keyboardType]').hide();
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block');
$form.find('.form-item[rel=xenserverToolsVersion61plus]').css('display', 'inline-block');
} else {
$form.find('.form-item[rel=rootDiskControllerType]').hide();
$form.find('.form-item[rel=nicAdapterType]').hide();
$form.find('.form-item[rel=keyboardType]').hide();
$form.find('.form-item[rel=xenserverToolsVersion61plus]').hide();
$form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide();
}
@ -279,7 +278,7 @@
label: 'label.xenserver.tools.version.61.plus',
isBoolean: true,
isChecked: function (args) {
var b = false;
var b = true;
if (isAdmin()) {
$.ajax({
url: createURL('listConfigurations'),
@ -288,8 +287,8 @@
},
async: false,
success: function (json) {
if (json.listconfigurationsresponse.configuration != null && json.listconfigurationsresponse.configuration[0].value == 'xenserver61') {
b = true;
if (json.listconfigurationsresponse.configuration != null && json.listconfigurationsresponse.configuration[0].value != 'xenserver61') {
b = false;
}
}
});