diff --git a/QS-backup-and-restore-app.zip b/QS-backup-and-restore-app.zip
index f9e81d1..907c9c4 100644
Binary files a/QS-backup-and-restore-app.zip and b/QS-backup-and-restore-app.zip differ
diff --git a/backup-and-restore.html b/backup-and-restore.html
index a4e4544..0d2096a 100644
--- a/backup-and-restore.html
+++ b/backup-and-restore.html
@@ -28,7 +28,7 @@
Backup file:
Restore Restore dataconnectors?
- Backup Be careful with restoring data connectors! Data connectors are never deleted through this app.
+ Backup Be careful restoring data connectors in server environment!!! Data connectors are never deleted through this app.
diff --git a/backup-and-restore.js b/backup-and-restore.js
index a4c9f64..6a5cc09 100644
--- a/backup-and-restore.js
+++ b/backup-and-restore.js
@@ -99,7 +99,7 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
})
}
break;
- case "dataconnections1":
+ case "dataconnections":
if ($('#dataconnrestore').prop('checked') == true) {
for (var i = 0; i < backupContent[name].length; i++) {
backupInfos.push({
@@ -202,11 +202,6 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
return main.app.createDimension(d.data).then(function (msg) {
return importData.push(['dimension', d.data.qMetaDef.title, d.info.qId, 'create']);
})
- } else if (d.info.qType === 'variable') {
- //console.log(JSON.stringify(d.data));
- return main.app.createVariableEx(d.data).then(function (msg) {
- return importData.push(['variable', d.data.qName, d.info.qId, 'create']);
- })
} else if (d.info.qType === 'snapshot' || d.info.qType === 'bookmark') {
return main.app.createBookmark(d.data).then(function (msg) {
var snapTitle;
@@ -237,17 +232,20 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
})
}
else if (d.data.qProperty) {
- console.log('t')
return main.app.createObject(d.data.qProperty).then(function (handle) {
return handle.setFullPropertyTree(d.data).then(function () {
return importData.push([d.info.qType, '', d.info.qId, 'create']);
});
})
+ } else if (d.info.qType === 'variable') {
+ //console.log(JSON.stringify(d.data));
+ return main.app.createVariableEx(d.data).then(function (msg) {
+ return importData.push(['variable', d.data.qName, d.info.qId, 'create']);
+ })
}
})).catch(function (error) {
importErrors++;
- //importData.push([d.info.qType, d.data.qConnection.qName, d.info.qId, 'Error: ' + error.message]);
- console.log(error)
+ //console.log(error)
})
}
@@ -423,7 +421,7 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
$('#errorsCount').text('');
$('#openDoc').text('No active document');
$('#json').prop('disabled', true);
- $('#json').val(null);
+ $('#json').val(null);
$('#prestatus').html('');
var table = $('#resultTable').DataTable();
table
@@ -563,7 +561,7 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
setAppProperties()
])
.then(function (results) {
- //main.app.doSave().then(function (results) {
+ main.app.doSave().then(function (results) {
GenerateTable();
//$('#json').replaceWith($("#json").clone());
$('#go').prop('disabled', true);
@@ -574,7 +572,7 @@ require(['jquery', 'qsocks', 'serializeApp', 'dataTables'], function ($, qsocks,
main.global.connection.ws.close();
main = {};
$('#json').val(null);
- //});
+ });
});
})
diff --git a/backup-and-restore.qext b/backup-and-restore.qext
index e6480b3..d21aaa6 100644
--- a/backup-and-restore.qext
+++ b/backup-and-restore.qext
@@ -1,7 +1,7 @@
{
"type": "mashup",
"name": "Backup and Restore",
- "version": "0.9.9",
+ "version": "0.10.0",
"description": "Bachup and restore QS app",
"preview": "images/preview.png",
"homepage": "https://github.com/countnazgul/QS-backup-and-restore-app",