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
2021-01-15 20:53:48 +00:00
parent 8fa01c9638
commit 9ee1a68b84
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/PickList/PickListSqlBuilder.cs
View File

@@ -97,11 +97,11 @@ namespace AyaNova.PickList
//if there is an override to see inactive too then we just don't set the filter on active //if there is an override to see inactive too then we just don't set the filter on active
if (!IncludeInactive) if (!IncludeInactive)
{ {
if (preIds.Length>0) if (preIds.Length > 0)
{ {
//pre-selected need to always appear regardless of active status //pre-selected need to always appear regardless of active status
//ActiveWhereFragment = $"({rowIdColumn.SqlIdColumnName} = {preId}) or ({activeColumn.SqlValueColumnName} = true)"; //ActiveWhereFragment = $"({rowIdColumn.SqlIdColumnName} = {preId}) or ({activeColumn.SqlValueColumnName} = true)";
ActiveWhereFragment = $"({rowIdColumn.SqlIdColumnName} in ({string.Join(",", preIds)})) or ({activeColumn.SqlValueColumnName} = true)"; ActiveWhereFragment = $"({rowIdColumn.SqlIdColumnName} in ({string.Join(",", preIds)})) or ({activeColumn.SqlValueColumnName} = true)";
} }
else else
{ {
@@ -291,7 +291,7 @@ namespace AyaNova.PickList
{ {
//we might have a trailing and to remove //we might have a trailing and to remove
//jesus this stuff sucks, there must be a better way, it seems so fragile //jesus this stuff sucks, there must be a better way, it seems so fragile
if (!IncludeInactive || HasTagSpecificQuery) if (!IncludeInactive || HasTagSpecificQuery || preIds.Length > 0)
{ {
//trailing " and " to remove //trailing " and " to remove
sb.Length -= 5; sb.Length -= 5;