mirrors/uptime-kuma
mirrors/uptime-kuma
0
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-30 23:10:41 +01:00
Code Issues Releases Wiki Activity

Used compare-version instead of replace

Browse Source
This commit is contained in:
Ponkhy 2021-09-23 17:15:11 +02:00
parent 23a63213aa
commit d3d4363031
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/server.js
View File

@ -951,9 +951,8 @@ exports.entryPage = "dashboard";
let notificationListData = backupData.notificationList; let notificationListData = backupData.notificationList;
let monitorListData = backupData.monitorList; let monitorListData = backupData.monitorList;
// Converts the Uptime Kuma Version to a Number | 1.6.0 => 160 let version17x = compareVersions.compare(backupData.version, '1.7.0', '>=')
let version = backupData.version.replace(/\./g, "");
// If the import option is "overwrite" it'll clear most of the tables, except "settings" and "user" // If the import option is "overwrite" it'll clear most of the tables, except "settings" and "user"
if (importHandle == "overwrite") { if (importHandle == "overwrite") {
// Stops every monitor first, so it doesn't execute any heartbeat while importing // Stops every monitor first, so it doesn't execute any heartbeat while importing
@ -1007,7 +1006,7 @@ exports.entryPage = "dashboard";
Only replace the default value with the backup file data for the specific version, where it appears the first time Only replace the default value with the backup file data for the specific version, where it appears the first time
More information about that where "let version" will be defined More information about that where "let version" will be defined
*/ */
if (version >= 170) { if (version17x) {
retryInterval = monitorListData[i].retryInterval; retryInterval = monitorListData[i].retryInterval;
} }
@ -1046,7 +1045,7 @@ exports.entryPage = "dashboard";
await R.store(bean); await R.store(bean);
// Only for backup files with the version 1.7.0 or higher, since there was the tag feature implemented // Only for backup files with the version 1.7.0 or higher, since there was the tag feature implemented
if (version >= 170) { if (version17x) {
// Only import if the specific monitor has tags assigned // Only import if the specific monitor has tags assigned
if (monitorListData[i].tags.length >= 1) { if (monitorListData[i].tags.length >= 1) {
for (let o = 0; o < monitorListData[i].tags.length; o++) { for (let o = 0; o < monitorListData[i].tags.length; o++) {