From 53323077aed5ec15ff3980915478f4b1b3bb604a Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 7 Mar 2022 14:33:42 +0200 Subject: [PATCH] Update delete device profile warning text to mention associated OTA updates --- application/src/main/data/upgrade/3.3.3/schema_update.sql | 2 +- .../thingsboard/server/install/ThingsboardInstallService.java | 1 - ui-ngx/src/assets/locale/locale.constant-en_US.json | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/src/main/data/upgrade/3.3.3/schema_update.sql b/application/src/main/data/upgrade/3.3.3/schema_update.sql index dbaecc245f..4183fb687a 100644 --- a/application/src/main/data/upgrade/3.3.3/schema_update.sql +++ b/application/src/main/data/upgrade/3.3.3/schema_update.sql @@ -1,5 +1,5 @@ -- --- Copyright © 2016-2021 The Thingsboard Authors +-- Copyright © 2016-2022 The Thingsboard Authors -- -- Licensed under the Apache License, Version 2.0 (the "License"); -- you may not use this file except in compliance with the License. diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index edf5c88420..2415fc7394 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -218,7 +218,6 @@ public class ThingsboardInstallService { log.info("Upgrading ThingsBoard from version 3.3.3 to 3.3.4 ..."); databaseEntitiesUpgradeService.upgradeDatabase("3.3.3"); log.info("Updating system data..."); - databaseEntitiesUpgradeService.upgradeDatabase("3.3.3"); systemDataLoaderService.updateSystemWidgets(); break; diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index d593fd0c08..aab433c992 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -1119,9 +1119,9 @@ "mobile-dashboard-hint": "Used by mobile application as a device details dashboard", "select-queue-hint": "Select from a drop-down list.", "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?", - "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.", + "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data including associated OTA updates will become unrecoverable.", "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?", - "delete-device-profiles-text": "Be careful, after the confirmation all selected device profiles will be removed and all related data will become unrecoverable.", + "delete-device-profiles-text": "Be careful, after the confirmation all selected device profiles will be removed and all related data including associated OTA updates will become unrecoverable.", "set-default-device-profile-title": "Are you sure you want to make the device profile '{{deviceProfileName}}' default?", "set-default-device-profile-text": "After the confirmation the device profile will be marked as default and will be used for new devices with no profile specified.", "no-device-profiles-found": "No device profiles found.",