From 27ecaba4234df2a3021a1f7abbb8feb1b2cdd34f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 28 Jul 2020 00:06:52 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/generator/CoreJobNotify.cs | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 4a182b76..fe194dde 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -51,7 +51,7 @@ "AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", - "AYANOVA_SERVER_TEST_MODE":"true", + "AYANOVA_SERVER_TEST_MODE":"false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7", "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\" diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs index 7b479d44..d75b2d14 100644 --- a/server/AyaNova/generator/CoreJobNotify.cs +++ b/server/AyaNova/generator/CoreJobNotify.cs @@ -223,7 +223,9 @@ namespace AyaNova.Biz try { var body = ""; - if (ne.ObjectId != 0) + //NOTE: if need any other exemptions besides backup status make a separate static function "CanOpen(NotifyEventType)" + + if (ne.ObjectId != 0 || ne.EventType == NotifyEventType.BackupStatus) { body = OpenObjectUrlBuilder(ne.AyaType, ne.ObjectId, ne.EventType) + "\n"; } @@ -287,6 +289,13 @@ namespace AyaNova.Biz } ServerUrl = ServerUrl.Trim().TrimEnd('/'); + //HANDLE ITEMS WITHOUT TYPE OR ID + if (net == NotifyEventType.BackupStatus) + { + return $"{ServerUrl}/ops-backup"; + } + + //Might not have a type or id in which case nothing directly to open if (otype == AyaType.NoType || id == 0) {