From b6fc029da3d6eef3a0e030a6dc20d40355ef4acd Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 1 Jan 2021 22:49:39 +0000 Subject: [PATCH] --- .vscode/launch.json | 4 ++-- server/AyaNova/DataList/UnitDataList.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 6d395cd7..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,8 +53,8 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", - "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "huge", + "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\\postgres_13\\bin\\" }, diff --git a/server/AyaNova/DataList/UnitDataList.cs b/server/AyaNova/DataList/UnitDataList.cs index dd839d93..e4ea6757 100644 --- a/server/AyaNova/DataList/UnitDataList.cs +++ b/server/AyaNova/DataList/UnitDataList.cs @@ -11,7 +11,7 @@ namespace AyaNova.DataList SQLFrom = "from aunit " + "left outer join acustomer on (aunit.customerid=acustomer.id) " + "left outer join aunit as aparentunit on (aunit.parentunitid=aunit.id and aunit.parentunitid <> null) " - + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id and aunit.unitmodelid <> null) " + + "left outer join aunitmodel on (aunit.unitmodelid=aunitmodel.id and aunit.unitmodelid <> null) " + "left outer join avendor on (aunit.purchasedfromvendorid=avendor.id and aunit.purchasedfromvendorid <> null) " + "left outer join aunit as areplacedbyunit on (aunit.replacedbyunitid=aunit.id and aunit.replacedbyunitid <> null) "; var RoleSet = BizRoles.GetRoleSet(DefaultListObjectType); @@ -117,7 +117,7 @@ namespace AyaNova.DataList UiFieldDataType = (int)UiFieldDataType.Text, AyaObjectType = (int)AyaType.UnitModel, SqlIdColumnName = "aunitmodel.id", - SqlValueColumnName = "aunitmodel.name" + SqlValueColumnName = "aunitmodel.number" }); FieldDefinitions.Add(new AyaDataListFieldDefinition