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

Extended UI field defaultValue (and isChecked) to allow for functions not just literals.

This commit is contained in:
Chris Suich 2013-07-31 13:50:29 -04:00 committed by Brian Federle
parent 151fc3e837
commit 9c9724d470
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/sharedFunctions.js
View File

@ -1453,3 +1453,9 @@ cloudStack.api = {
};
}
};
function strOrFunc(arg, args) {
if (typeof arg === 'function')
return arg(args);
return arg;
}

10
ui/scripts/ui/dialog.js
View File

@ -264,7 +264,7 @@
});
if (field.defaultValue) {
$input.val(_s(field.defaultValue));
$input.val(_s(strOrFunc(field.defaultValue, args.data)));
}
$input.trigger('change');
@ -367,7 +367,7 @@
type: 'checkbox'
}).appendTo($value);
if (field.isChecked) {
$input.attr('checked', 'checked');
$input.attr('checked', strOrFunc(field.isChecked));
} else {
// This is mainly for IE compatibility
setTimeout(function() {
@ -421,7 +421,7 @@
}).appendTo($value);
if (field.defaultValue) {
$input.val(field.defaultValue);
$input.val(strOrFunc(field.defaultValue));
}
} else if (field.isDatepicker) { //jQuery datepicker
$input = $('<input>').attr({
@ -430,7 +430,7 @@
}).appendTo($value);
if (field.defaultValue) {
$input.val(field.defaultValue);
$input.val(strOrFunc(field.defaultValue));
}
if (field.id) {
$input.attr('id', field.id);
@ -525,7 +525,7 @@
}).appendTo($value);
if (field.defaultValue) {
$input.val(field.defaultValue);
$input.val(strOrFunc(field.defaultValue));
}
if (field.id) {
$input.attr('id', field.id);