Fixes for joins

This commit is contained in:
2023-05-01 15:12:51 -05:00
parent ca8834dec2
commit 74f0876de4
2 changed files with 30 additions and 7 deletions

View File

@ -59,12 +59,15 @@ export default class DataGridUtils
{
const join = tableMetaData.exposedJoins[i];
const fields = [ ...join.joinTable.fields.values() ];
fields.forEach((field) =>
if(join?.joinTable?.fields?.values())
{
let fieldName = join.joinTable.name + "." + field.name;
row[fieldName] = ValueUtils.getDisplayValue(field, record, "query", fieldName);
});
const fields = [...join.joinTable.fields.values()];
fields.forEach((field) =>
{
let fieldName = join.joinTable.name + "." + field.name;
row[fieldName] = ValueUtils.getDisplayValue(field, record, "query", fieldName);
});
}
}
}
@ -107,7 +110,10 @@ export default class DataGridUtils
joinLinkBase += joinLinkBase.endsWith("/") ? "" : "/";
}
this.addColumnsForTable(join.joinTable, joinLinkBase, columns, columnSort, join.joinTable.name + ".", join.label + ": ");
if(join?.joinTable?.fields?.values())
{
this.addColumnsForTable(join.joinTable, joinLinkBase, columns, columnSort, join.joinTable.name + ".", join.label + ": ");
}
}
}