CS-16452: cloudstack UI - dialog widget - call field.selectFn regardless of value of field.isHidden.

This commit is contained in:
Jessica Wang 2012-10-04 16:56:36 -07:00
parent 603404c564
commit 8ea0a230e6

View File

@ -201,8 +201,7 @@
$input = $('<select>')
.attr({ name: key })
.data('dialog-select-fn', function(args) {
if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false))
selectFn(args ? $.extend(true, {}, selectArgs, args) : selectArgs);
selectFn(args ? $.extend(true, {}, selectArgs, args) : selectArgs);
})
.appendTo($value);
@ -227,19 +226,16 @@
dependsOnArgs[dependsOn] = $target.val();
if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false))
selectFn($.extend(selectArgs, dependsOnArgs));
selectFn($.extend(selectArgs, dependsOnArgs));
return true;
});
if (!$dependsOn.is('select')) {
if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false))
selectFn(selectArgs);
selectFn(selectArgs);
}
} else {
if((field.isHidden == null) || (typeof(field.isHidden) == 'boolean' && field.isHidden == false) || (typeof(field.isHidden) == 'function' && field.isHidden() == false))
selectFn(selectArgs);
selectFn(selectArgs);
}
} else if (field.isBoolean) {
if (field.multiArray) {