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

Merge branch '3.0.3' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.3 

Putting my name in reviewed by as it is a merge.
reviewed-by: Devdeep

Conflicts:
	ui/scripts/system.js
This commit is contained in:
Devdeep Singh 2012-05-24 00:07:27 +05:30
parent 579174b5bb c86b8ac069
commit 917cd561ce
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/configuration.js
View File

@ -1126,7 +1126,7 @@
if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true)
&&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler'
|| args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp')
&&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Isolated')) {
) {
args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block');
}
else {

24
ui/scripts/system.js
View File

@ -6111,12 +6111,16 @@
args.$select.bind("change", function(event) {
var $form = $(this).closest('form');
var $vsmFields = $.merge(
$form.find('.form-item[rel=vsmipaddress]'),
$form.find('.form-item[rel=vsmusername]'),
$form.find('.form-item[rel=vsmpassword]')
);
var $vsmFields = $form.find('.form-item').filter(function() {
var vsmFields = [
'vsmipaddress',
'vsmusername',
'vsmpassword'
];
return $.inArray($(this).attr('rel'), vsmFields) > -1;
});
if ($(this).val() == "VMware") {
//$('li[input_sub_group="external"]', $dialogAddCluster).show();
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
@ -6224,10 +6228,10 @@
array1.push("&username=" + todb(args.data.vCenterUsername));
array1.push("&password=" + todb(args.data.vCenterPassword));
array1.push('&vsmipaddress=' + args.data.vsmipaddress);
array1.push('&vsmusername=' + args.data.vsmusername);
array1.push('&vsmpassword=' + args.data.vsmpassword);
array1.push('&vsmipaddress=' + args.data.vsmipaddress);
array1.push('&vsmusername=' + args.data.vsmusername);
array1.push('&vsmpassword=' + args.data.vsmpassword);
var hostname = args.data.vCenterHost;
var dcName = args.data.vCenterDatacenter;