Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix latest backup refreshing with no caching

Browse source
This commit is contained in:
Stephen Birarda 2018-02-15 10:57:07 -08:00
parent 41b0bb8c58
commit 910f3425f8
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
domain-server/resources/web/content/js/content.js
View file

@ -107,7 +107,11 @@ $(document).ready(function(){
function reloadLatestBackups() { function reloadLatestBackups() {
// make a GET request to get backup information to populate the table // make a GET request to get backup information to populate the table
$.get('/api/backups', function(data) { $.ajax({
url: '/api/backups',
cache: false
}).done(function(data) {
// split the returned data into manual and automatic manual backups // split the returned data into manual and automatic manual backups
var splitBackups = _.partition(data.backups, function(value, index) { var splitBackups = _.partition(data.backups, function(value, index) {
return value.isManualBackup; return value.isManualBackup;
@ -126,7 +130,7 @@ $(document).ready(function(){
+ "<ul class='dropdown-menu dropdown-menu-right'>" + "<ul class='dropdown-menu dropdown-menu-right'>"
+ "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>" + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
+ "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>" + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>"
+ "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backups.id + "' target='_blank'>Delete</a></li></ul></div></td>"; + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backup.id + "' target='_blank'>Delete</a></li></ul></div></td>";
} }
var automaticRows = ""; var automaticRows = "";
@ -243,7 +247,7 @@ $(document).ready(function(){
}).always(function(){ }).always(function(){
// reload the list of content archives in case we deleted a backup // reload the list of content archives in case we deleted a backup
// or it's no longer an available backup for some other reason // or it's no longer an available backup for some other reason
reloadContentArchives(); reloadLatestBackups();
}); });
} }
) )
@ -295,14 +299,14 @@ $(document).ready(function(){
// post the provided archive name to ask the server to kick off a manual backup // post the provided archive name to ask the server to kick off a manual backup
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: '/api/backup', url: '/api/backups',
data: { data: {
'name': inputValue 'name': inputValue
} }
}).done(function(data) { }).done(function(data) {
// since we successfully setup a new content archive, reload the table of archives // since we successfully setup a new content archive, reload the table of archives
// which should show that this archive is pending creation // which should show that this archive is pending creation
reloadContentArchives(); reloadLatestBackups();
}).fail(function(jqXHR, textStatus, errorThrown) { }).fail(function(jqXHR, textStatus, errorThrown) {
}); });

4
domain-server/src/DomainServer.cpp
View file

@ -1941,7 +1941,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
const QString URI_ASSIGNMENT = "/assignment"; const QString URI_ASSIGNMENT = "/assignment";
const QString URI_NODES = "/nodes"; const QString URI_NODES = "/nodes";
const QString URI_SETTINGS = "/settings"; const QString URI_SETTINGS = "/settings";
const QString URI_ENTITY_FILE_UPLOAD = "/content/upload"; const QString URI_CONTENT_UPLOAD = "/content/upload";
const QString URI_RESTART = "/restart"; const QString URI_RESTART = "/restart";
const QString URI_API_PLACES = "/api/places"; const QString URI_API_PLACES = "/api/places";
const QString URI_API_DOMAINS = "/api/domains"; const QString URI_API_DOMAINS = "/api/domains";
@ -2251,7 +2251,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
connection->respond(HTTPConnection::StatusCode200); connection->respond(HTTPConnection::StatusCode200);
return true; return true;
} else if (url.path() == URI_ENTITY_FILE_UPLOAD) { } else if (url.path() == URI_CONTENT_UPLOAD) {
// this is an entity file upload, ask the HTTPConnection to parse the data // this is an entity file upload, ask the HTTPConnection to parse the data
QList<FormData> formData = connection->parseFormData(); QList<FormData> formData = connection->parseFormData();