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

BUGZ-829 fix a few nits

Browse source
This commit is contained in:
Roxanne Skelly 2019-07-24 15:33:13 -07:00
parent 783c61500e
commit fe4334d6c4
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,7 +249,6 @@ $(document).ready(function(){
url: '/api/backups', url: '/api/backups',
cache: false cache: false
}).done(function(data) { }).done(function(data) {
console.log(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;
@ -265,7 +264,7 @@ console.log(data);
confirmButtonText: "Restart", confirmButtonText: "Restart",
closeOnConfirm: true, closeOnConfirm: true,
}, },
function() { function () {
$.get("/restart"); $.get("/restart");
showRestartModal(); showRestartModal();
}); });

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

@ -240,12 +240,12 @@ void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
Q_ASSERT(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
if (operationInProgress()) { if (operationInProgress()) {
qCWarning(asset_backup) << "There is already an operation in progress. Please wait."; qCWarning(asset_backup) << "There is already an operation in progress.";
return; return;
} }
if (_assetServerEnabled && _lastMappingsRefresh.time_since_epoch().count() == 0) { if (_assetServerEnabled && _lastMappingsRefresh.time_since_epoch().count() == 0) {
qCWarning(asset_backup) << "Current mappings not yet loaded. Please wait."; qCWarning(asset_backup) << "Current mappings not yet loaded.";
_backups.emplace_back(backupName, AssetUtils::Mappings(), true); _backups.emplace_back(backupName, AssetUtils::Mappings(), true);
return; return;
} }

2
domain-server/src/DomainContentBackupManager.cpp
View file

@ -173,6 +173,8 @@ bool DomainContentBackupManager::process() {
return handler->getRecoveryStatus().first; return handler->getRecoveryStatus().first;
}); });
// if an error occurred, don't restart the server so that the user
// can be notified of the error and take action.
if (!isStillRecovering && _recoveryError.isEmpty()) { if (!isStillRecovering && _recoveryError.isEmpty()) {
_isRecovering = false; _isRecovering = false;
_recoveryFilename = ""; _recoveryFilename = "";