admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-06-18 19:59:45 +00:00
parent 6c699e1054
commit e192ca042b
7 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -44,7 +44,7 @@
//"AYANOVA_LOG_LEVEL": "Debug", //"AYANOVA_LOG_LEVEL": "Debug",
"AYANOVA_DEFAULT_TRANSLATION": "en", "AYANOVA_DEFAULT_TRANSLATION": "en",
//TRANSLATION MUST BE en for Integration TESTING //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_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",

2
server/AyaNova/Controllers/GlobalBizSettingsController.cs
View File

@@ -113,7 +113,7 @@ namespace AyaNova.Api.Controllers
//used to drive UI in case of unlicensed or attention required //used to drive UI in case of unlicensed or attention required
LicenseStatus = AyaNova.Core.License.ActiveKey.Status, LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired, MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
DbId = AyaNova.Core.License.ActiveKey.DbId ServerDbId = AyaNova.Core.License.ServerDbId
}; };

7
server/AyaNova/Controllers/LicenseController.cs
View File

@@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers
return Ok(ApiOkResponse.Response(ret)); return Ok(ApiOkResponse.Response(ret));
} }
/// <summary> /// <summary>
/// Get DB Emptiness /// Get DB Emptiness
/// </summary> /// </summary>
/// <returns>Checks if there is any data in critical tables only</returns> /// <returns>Checks if there is any data in critical tables only</returns>
@@ -86,7 +86,7 @@ namespace AyaNova.Api.Controllers
if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.License)) if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.License))
{ {
return StatusCode(403, new ApiNotAuthorizedResponse()); return StatusCode(403, new ApiNotAuthorizedResponse());
} }
return Ok(ApiOkResponse.Response(await AyaNova.Util.DbUtil.DBIsEmptyAsync(ct, log))); return Ok(ApiOkResponse.Response(await AyaNova.Util.DbUtil.DBIsEmptyAsync(ct, log)));
} }
@@ -132,7 +132,8 @@ namespace AyaNova.Api.Controllers
} }
else 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 //any response here is OK, there's not necessarily an error, just no key or some mundane problem not technical but biz so let

3
server/AyaNova/resource/de.json
View File

@@ -1832,5 +1832,6 @@
"JobCompleted":"Arbeit erledigt", "JobCompleted":"Arbeit erledigt",
"JobFailed":"Job fehlgeschlagen", "JobFailed":"Job fehlgeschlagen",
"MaintenanceExpired":"Wartung abgelaufen", "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"
} }

4
server/AyaNova/resource/en.json
View File

@@ -1832,6 +1832,8 @@
"JobCompleted":"Job completed", "JobCompleted":"Job completed",
"JobFailed":"Job failed", "JobFailed":"Job failed",
"MaintenanceExpired":"Maintenance expired", "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"
} }

3
server/AyaNova/resource/es.json
View File

@@ -1832,5 +1832,6 @@
"JobCompleted":"Trabajo completo", "JobCompleted":"Trabajo completo",
"JobFailed":"Trabajo fallido", "JobFailed":"Trabajo fallido",
"MaintenanceExpired":"Mantenimiento expirado", "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"
} }

3
server/AyaNova/resource/fr.json
View File

@@ -1832,5 +1832,6 @@
"JobCompleted":"Travail terminé", "JobCompleted":"Travail terminé",
"JobFailed":"Le travail a échoué", "JobFailed":"Le travail a échoué",
"MaintenanceExpired":"Maintenance expirée", "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"
} }