diff --git a/.vscode/launch.json b/.vscode/launch.json index 47a5435c..379d2046 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -44,7 +44,7 @@ //"AYANOVA_LOG_LEVEL": "Debug", "AYANOVA_DEFAULT_TRANSLATION": "en", //TRANSLATION MUST BE en for Integration TESTING - "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", + //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;", "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs index c2e93331..4dfd6b83 100644 --- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs @@ -113,7 +113,7 @@ namespace AyaNova.Api.Controllers //used to drive UI in case of unlicensed or attention required LicenseStatus = AyaNova.Core.License.ActiveKey.Status, MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired, - DbId = AyaNova.Core.License.ActiveKey.DbId + ServerDbId = AyaNova.Core.License.ServerDbId }; diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 3a0571a7..74afd4ed 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers return Ok(ApiOkResponse.Response(ret)); } - /// + /// /// Get DB Emptiness /// /// Checks if there is any data in critical tables only @@ -86,7 +86,7 @@ namespace AyaNova.Api.Controllers if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.License)) { return StatusCode(403, new ApiNotAuthorizedResponse()); - } + } return Ok(ApiOkResponse.Response(await AyaNova.Util.DbUtil.DBIsEmptyAsync(ct, log))); } @@ -132,7 +132,8 @@ namespace AyaNova.Api.Controllers } else { - log.LogError($"LicenseController::FetchLicense - failed: {ret}"); + if (ret != "notfound") + log.LogError($"LicenseController::FetchLicense - failed: {ret}"); } //any response here is OK, there's not necessarily an error, just no key or some mundane problem not technical but biz so let diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index ee4c93ff..ce3a1d7e 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1832,5 +1832,6 @@ "JobCompleted":"Arbeit erledigt", "JobFailed":"Job fehlgeschlagen", "MaintenanceExpired":"Wartung abgelaufen", - "MaintenanceExpiredNote":"Das Support- und Update-Abonnement ist jetzt abgelaufen.\nAyaNova kann nicht aktualisiert werden und der Support ist nicht mehr verfügbar" + "MaintenanceExpiredNote":"Das Support- und Update-Abonnement ist jetzt abgelaufen.\nAyaNova kann nicht aktualisiert werden und der Support ist nicht mehr verfügbar", + "CopyDbId":"Datenbank-ID kopieren" } \ No newline at end of file diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index 4040d411..a52c11cc 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1832,6 +1832,8 @@ "JobCompleted":"Job completed", "JobFailed":"Job failed", "MaintenanceExpired":"Maintenance expired", - "MaintenanceExpiredNote":"The support and updates subscription has now expired\nAyaNova can not be updated and support is no longer available" + "MaintenanceExpiredNote":"The support and updates subscription has now expired\nAyaNova can not be updated and support is no longer available", + "CopyDbId":"Copy database id" + } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index ad273e27..e1dd1510 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1832,5 +1832,6 @@ "JobCompleted":"Trabajo completo", "JobFailed":"Trabajo fallido", "MaintenanceExpired":"Mantenimiento expirado", - "MaintenanceExpiredNote":"La suscripción de soporte y actualizaciones ha caducado\nAyaNova no se puede actualizar y el soporte ya no está disponible" + "MaintenanceExpiredNote":"La suscripción de soporte y actualizaciones ha caducado\nAyaNova no se puede actualizar y el soporte ya no está disponible", + "CopyDbId":"Copiar ID de base de datos" } \ No newline at end of file diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index 7aa23e03..cb3805c7 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1832,5 +1832,6 @@ "JobCompleted":"Travail terminé", "JobFailed":"Le travail a échoué", "MaintenanceExpired":"Maintenance expirée", - "MaintenanceExpiredNote":"L'abonnement au support et aux mises à jour a expiré\nAyaNova ne peut pas être mis à jour et le support n'est plus disponible" + "MaintenanceExpiredNote":"L'abonnement au support et aux mises à jour a expiré\nAyaNova ne peut pas être mis à jour et le support n'est plus disponible", + "CopyDbId":"Copier l'ID de la base de données" } \ No newline at end of file