openstack
/
freezer-web-ui
Code Issues Proposed changes

Merge "HTML-escape values written to output"

This commit is contained in:
Jenkins 2016-10-04 09:04:08 +00:00 committed by Gerrit Code Review
parent ddd7867370 f008c9d307
commit ee254f917f
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
disaster_recovery/static/freezer/js/freezer.jobs.sortable.js
View File

@ -9,6 +9,7 @@ $(function () {
}).disableSelection();
});
// BAD: This is putting all these members on global scope.
var parent = $(".sortable_lists").parent();
parent.removeClass("col-sm-6");
@ -44,6 +45,12 @@ function actions_url() {
return url;
}
function freezerLi(item) {
return $('<li class="list-group-item">')
.attr('id', item.action_id)
.text("(" + item.freezer_action.action + ") " + item.freezer_action.backup_name);
}
if (job_id !== "") {
$.ajax({
url: actions_in_job_url(),
@ -53,21 +60,15 @@ if (job_id !== "") {
contentType: 'application/json; charset=utf-8',
success: function (data) {
$.each(data.available, function (index, item) {
$("#actions_available").append(
"<li class='list-group-item' id=" + item.action_id + ">" +
"(" + item.freezer_action.action + ")" + " " + item.freezer_action.backup_name + "</li>"
);
$("#actions_available").append(freezerLi(item));
});
$.each(data.selected, function (index, item) {
$("#actions_selected").append(
"<li class='list-group-item' id=" + item.action_id + ">" +
"(" + item.freezer_action.action + ")" + " " + item.freezer_action.backup_name + "</li>"
);
$("#actions_selected").append(freezerLi(item));
});
},
error: function (request, error) {
$("#actions_available").append(
'<tr><td>Error getting action list</td></tr>'
'<tr><td>Error getting action list</td></tr>' // UNTRANSLATED
);
}
});
@ -80,15 +81,12 @@ if (job_id !== "") {
contentType: 'application/json; charset=utf-8' ,
success: function (data) {
$.each(data, function (index, item) {
$("#actions_available").append(
"<li class='list-group-item' id=" + item.action_id + ">" +
"(" + item.freezer_action.action + ")" + " " + item.freezer_action.backup_name + "</li>"
);
$("#actions_available").append(freezerLi(item));
});
},
error: function (request, error) {
$("#actions_available").append(
'<tr><td>Error getting action list</td></tr>'
'<tr><td>Error getting action list</td></tr>' // UNTRANSLATED
);
}
});

17
disaster_recovery/static/freezer/js/freezer.restore.js
View File

@ -25,6 +25,15 @@ function get_url() {
return url;
}
function freezerGetRow(item) {
var tr = $('<tr>');
tr.append($('<td class="multi_select_column">')
.append($('<input type="radio" name="client">')
.attr('value', item.client.client_id)));
tr.append($('<td>').text(item.client.hostname));
return tr;
}
$.ajax({
url: get_url(),
type: "GET",
@ -33,16 +42,12 @@ $.ajax({
contentType: 'application/json; charset=utf-8',
success: function(data) {
$.each(data, function (index, item) {
$("#available_clients").append(
'<tr><td class="multi_select_column">' +
'<input type="radio" name="client" value=' + item.client.client_id + '></td>' +
'<td>' + item.client.hostname + '</td></tr>'
);
$("#available_clients").append(freezerGetRow(item));
});
},
error: function (request, error) {
$("#available_clients").append(
'<tr><td>Error getting client list</td></tr>'
'<tr><td>Error getting client list</td></tr>' // UNTRANSLATED
);
}
});