QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to not make a possible-value field be a record-link if it has a chip too.

Browse Source
This commit is contained in:
darin.kelkhoff
2023-02-08 17:05:01 -06:00
parent 2d09a521cd
commit eae01bb8c4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java
View File

@ -327,7 +327,7 @@ public class QInstanceEnricher
// and that PVS exists in the instance // // and that PVS exists in the instance //
// and it's a table-type PVS and the table name is set // // and it's a table-type PVS and the table name is set //
// and it's a valid table in the instance, and the table is in some app // // and it's a valid table in the instance, and the table is in some app //
// and the field doesn't have a LINK adornment // // and the field doesn't (already) have a LINK or CHIP adornment //
// then add a link-to-record-from-table adornment to the field. // // then add a link-to-record-from-table adornment to the field. //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
if(StringUtils.hasContent(field.getPossibleValueSourceName())) if(StringUtils.hasContent(field.getPossibleValueSourceName()))
@ -340,7 +340,15 @@ public class QInstanceEnricher
{ {
if(qInstance.getTable(tableName) != null && doesAnyAppHaveTable(tableName)) if(qInstance.getTable(tableName) != null && doesAnyAppHaveTable(tableName))
{ {
if(field.getAdornments() == null || field.getAdornments().stream().noneMatch(a -> AdornmentType.LINK.equals(a.getType()))) boolean hasLinkAdornment = false;
boolean hasChipAdornment = false;
if(field.getAdornments() != null)
{
hasLinkAdornment = field.getAdornments().stream().anyMatch(a -> AdornmentType.LINK.equals(a.getType()));
hasChipAdornment = field.getAdornments().stream().anyMatch(a -> AdornmentType.CHIP.equals(a.getType()));
}
if(!hasLinkAdornment && !hasChipAdornment)
{ {
field.withFieldAdornment(new FieldAdornment().withType(AdornmentType.LINK) field.withFieldAdornment(new FieldAdornment().withType(AdornmentType.LINK)
.withValue(AdornmentType.LinkValues.TO_RECORD_FROM_TABLE, tableName)); .withValue(AdornmentType.LinkValues.TO_RECORD_FROM_TABLE, tableName));