This commit is contained in:
2020-02-10 23:00:27 +00:00
parent 3c5890bc7b
commit abacdabd14
2 changed files with 39 additions and 47 deletions

View File

@@ -399,6 +399,7 @@ export default {
that.serverColumns = res.columns;
//Make sure the locale keys are fetched
await fetchLocalizedHeaderNames(res.columns); //Note can use await here because it's wrapped inside an async function call, it will wait then resume next stuff below
await fetchEnums(res.columns);
//build that.headers here
that.headers = buildHeaders(res.columns);
//Post process data here and then set that.records
@@ -536,8 +537,12 @@ function buildRecords(listData, columndefinitions, filters) {
This way entirely bypasses locale stuff
//big object so maybe it's own thing, not part of locale at all or locale fronts for it??
*/
window.$gz.enums.getEnumList(columndefinitions[iColumn].et);
display = columndefinitions[iColumn].et + "." + display;
// window.$gz.enums.getEnumList(columndefinitions[iColumn].et);
//display = columndefinitions[iColumn].et + "." + display;
display = window.$gz.enums.get(
columndefinitions[iColumn].et,
display
);
break;
default:
//do nothing, allow it to stay as is
@@ -593,6 +598,23 @@ async function fetchLocalizedHeaderNames(columnData) {
});
}
//////////////////////////////////////////////////////////
//
// Ensures column enums are present in enums list in store
//
async function fetchEnums(columnData) {
if (!columnData) {
return;
}
var headerKeys = [];
for (var i = 1; i < columnData.length; i++) {
var cm = columnData[i];
if (cm.et) {
await window.$gz.enums.fetchEnumList(cm.et);
}
}
}
//CURRENTLY THINKING NOT TO CACHE THIS AS
//users might only ever view the list and
//often it might not contain the whole range of options