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

Fix to skip, not blow up, on unrecognized field names

Browse Source
This commit is contained in:
darin.kelkhoff
2023-05-03 16:47:03 -05:00
parent 4aa1aed632
commit 9c5106d7a8
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java
View File

@ -41,6 +41,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils;
import com.kingsrook.qqq.backend.core.utils.ValueUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils;
import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
/******************************************************************************* /*******************************************************************************
@ -304,21 +305,32 @@ public class QValueFormatter
{ {
if(!fieldMap.containsKey(fieldName)) if(!fieldMap.containsKey(fieldName))
{ {
if(fieldName.contains(".")) try
{ {
String[] nameParts = fieldName.split("\\.", 2); if(fieldName.contains("."))
for(ExposedJoin exposedJoin : CollectionUtils.nonNullList(table.getExposedJoins()))
{ {
if(exposedJoin.getJoinTable().equals(nameParts[0])) String[] nameParts = fieldName.split("\\.", 2);
for(ExposedJoin exposedJoin : CollectionUtils.nonNullList(table.getExposedJoins()))
{ {
QTableMetaData joinTable = QContext.getQInstance().getTable(nameParts[0]); if(exposedJoin.getJoinTable().equals(nameParts[0]))
fieldMap.put(fieldName, joinTable.getField(nameParts[1])); {
QTableMetaData joinTable = QContext.getQInstance().getTable(nameParts[0]);
fieldMap.put(fieldName, joinTable.getField(nameParts[1]));
}
} }
} }
else
{
fieldMap.put(fieldName, table.getField(fieldName));
}
} }
else catch(Exception e)
{ {
fieldMap.put(fieldName, table.getField(fieldName)); ///////////////////////////////////////////////////////////
// put an empty field in - so no formatting will be done //
///////////////////////////////////////////////////////////
LOG.info("Error getting field for setting display value", e, logPair("fieldName", fieldName), logPair("tableName", table.getName()));
fieldMap.put(fieldName, new QFieldMetaData());
} }
} }
} }