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-12-15 15:49:27 +00:00
parent 9c65341b49
commit 477c0e90b1
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
"AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE": "true",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

5
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -35,8 +35,11 @@ namespace AyaNova.DataList
//Get some info about this column / field //Get some info about this column / field
var fld = cm["fld"].Value<string>(); var fld = cm["fld"].Value<string>();
var dataType = objectFieldsList.Find(z => z.FieldKey.ToLowerInvariant() == fld).UiFieldDataType;
//var dataType = objectFieldsList.Find(z => z.FieldKey.ToLowerInvariant() == fld.ToLowerInvariant()).UiFieldDataType;
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(z => z.FieldKey == fld); AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(z => z.FieldKey == fld);
var dataType = DataListField.UiFieldDataType;
//No filtering on custom fields! //No filtering on custom fields!
if (DataListField.IsCustomField) if (DataListField.IsCustomField)

2
server/AyaNova/biz/DataListViewBiz.cs
View File

@@ -283,7 +283,7 @@ namespace AyaNova.Biz
if (DataList != null) if (DataList != null)
{ {
var TheField = DataList.FieldDefinitions.SingleOrDefault(z => z.FieldKey.ToLowerInvariant() == fld); var TheField = DataList.FieldDefinitions.SingleOrDefault(z => z.FieldKey.ToLowerInvariant() == fld.ToLowerInvariant());
if (TheField == null) if (TheField == null)
{ {

12
server/AyaNova/biz/MemoBiz.cs
View File

@@ -100,9 +100,19 @@ namespace AyaNova.Biz
// //
internal async Task<Memo> GetAsync(long id, bool logTheGetEvent = true) internal async Task<Memo> GetAsync(long id, bool logTheGetEvent = true)
{ {
var ret = await ct.Memo.SingleOrDefaultAsync(m => m.Id == id && m.ToId==UserId);//## SECURITY, if need general purpose then make new method var ret = await ct.Memo.SingleOrDefaultAsync(m => m.Id == id && m.ToId == UserId);//## SECURITY, if need general purpose then make new method
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
{
//Hijack this method to also flag as read
//batch ops will get but will set logthegetevent as false which is helpful for also setting read or not
if (!ret.Viewed)
{
//FLAG VIEWED
ret.Viewed = true;
await ct.SaveChangesAsync();
}
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
}
return ret; return ret;
} }

2
server/AyaNova/biz/PickListBiz.cs
View File

@@ -248,7 +248,7 @@ namespace AyaNova.Biz
if (PickList != null) if (PickList != null)
{ {
var TheField = PickList.ColumnDefinitions.SingleOrDefault(z => z.FieldKey.ToLowerInvariant() == fld); var TheField = PickList.ColumnDefinitions.SingleOrDefault(z => z.FieldKey.ToLowerInvariant() == fld.ToLowerInvariant());
if (TheField == null) if (TheField == null)
{ {

8
server/AyaNova/util/Seeder.cs
View File

@@ -710,13 +710,13 @@ namespace AyaNova.Util
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
//Seed some test memos //Seed some test memos
{ {
for (int x = 0; x < 10; x++) for (int x = 0; x < 100; x++)
{ {
Memo memo = new Memo(); Memo memo = new Memo();
memo.Name = Fake.Rant.Review(); memo.Name = Fake.Lorem.Sentence();
memo.Notes = Fake.Lorem.Paragraphs(); memo.Notes = Fake.Lorem.Paragraphs();
memo.ToId = 1; memo.ToId = Fake.Random.Long(1, 15);
memo.FromId = Fake.Random.Long(2, 15); memo.FromId = Fake.Random.Long(1, 15);
memo.Tags = RandomTags(); memo.Tags = RandomTags();
using (AyContext ct = ServiceProviderProvider.DBContext) using (AyContext ct = ServiceProviderProvider.DBContext)
{ {