Sanitize input for multi-edit, notification widgets

This commit is contained in:
bfederle 2012-03-14 16:07:57 -07:00
parent 13864cc66a
commit 504e90b7cc
2 changed files with 9 additions and 9 deletions

View File

@ -88,8 +88,8 @@
if (field.edit) { if (field.edit) {
// Edit fields append value of data // Edit fields append value of data
if (field.range) { if (field.range) {
var start = data[field.range[0]]; var start = _s(data[field.range[0]]);
var end = data[field.range[1]]; var end = _s(data[field.range[1]]);
$td.append($('<span>').html(start + ' - ' + end)); $td.append($('<span>').html(start + ' - ' + end));
} else { } else {
@ -98,20 +98,20 @@
if (maxLengths && if (maxLengths &&
maxLengths[fieldName] && maxLengths[fieldName] &&
data[fieldName].length >= maxLengths[fieldName]) { data[fieldName].length >= maxLengths[fieldName]) {
$td.append($('<span>').html(data[fieldName].toString().substr(0, maxLengths[fieldName] - 3).concat('...'))); $td.append($('<span>').html(_s(data[fieldName].toString().substr(0, maxLengths[fieldName] - 3).concat('...'))));
} else { } else {
$td.append($('<span>').html(data[fieldName])); $td.append($('<span>').html(_s(data[fieldName])));
} }
$td.attr('title', data[fieldName]); $td.attr('title', data[fieldName]);
} }
} else if (field.select) { } else if (field.select) {
$td.append($('<span>').html( $td.append($('<span>').html(_s(
// Get matching option text // Get matching option text
$multi.find('select').filter(function() { $multi.find('select').filter(function() {
return $(this).attr('name') == fieldName; return $(this).attr('name') == fieldName;
}).find('option').filter(function() { }).find('option').filter(function() {
return $(this).val() == data[fieldName]; return $(this).val() == data[fieldName];
}).html())); }).html())));
} else if (field.addButton && !options.noSelect) { } else if (field.addButton && !options.noSelect) {
if (options.multipleAdd) { if (options.multipleAdd) {
$addButton.click(function() { $addButton.click(function() {
@ -511,7 +511,7 @@
itemRow: function(item, itemActions, multiRule, $tbody) { itemRow: function(item, itemActions, multiRule, $tbody) {
var $tr = $('<tr>'); var $tr = $('<tr>');
$tr.append($('<td></td>').appendTo($tr).html(item.name)); $tr.append($('<td></td>').appendTo($tr).html(_s(item.name)));
if (itemActions) { if (itemActions) {
var $itemActions = $('<td>').addClass('actions item-actions'); var $itemActions = $('<td>').addClass('actions item-actions');
@ -656,7 +656,7 @@
response: { response: {
success: function(args) { success: function(args) {
$(args.data).each(function() { $(args.data).each(function() {
$('<option>').val(this.name).html(this.description) $('<option>').val(this.name).html(_s(this.description))
.appendTo($select); .appendTo($select);
}); });
_medit.refreshItemWidths($multi); _medit.refreshItemWidths($multi);

View File

@ -93,7 +93,7 @@
incomplete: function(args) {}, incomplete: function(args) {},
error: function(args) { error: function(args) {
if (args.message) { if (args.message) {
cloudStack.dialog.notice({ message: args.message }); cloudStack.dialog.notice({ message: _s(args.message) });
} }
clearInterval(pollTimer); clearInterval(pollTimer);