diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index f29ed79c..a8d76c94 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -85,7 +85,7 @@
@@ -100,7 +100,7 @@ @@ -261,7 +261,7 @@ @@ -276,7 +276,7 @@ @@ -563,7 +563,7 @@ export default { }, gridCellButtonClick(key, i, ot) { let typeToOpen = null; - //if ot is not null then *that* is the Openable Type otherwise it's in the header data + //if ot is not null or undefined then *that* is the Openable Type otherwise it's in the header data if (ot) { typeToOpen = ot; } else { @@ -799,7 +799,8 @@ function buildRecords(listData, columndefinitions) { if ( columndefinitions[iColumn].et == "AyaType" && column.i != null && - column.i != 0 + column.i != 0 && + column.ot == undefined ) { //yes so provide the ot (openable type) info needed for the grid to make this openable // console.log("Openable type:", column); @@ -864,12 +865,19 @@ function buildRecords(listData, columndefinitions) { columnObject["i"] = column.i; } + //TODO: Deprecate in favor of ot system below //is the source column a special AyaType enum with an id signifying to be openable directly? if (openableAyaType) { //signal to grid to make it an openable link columnObject["ot"] = openableAyaType; } + //Is there an overriding openable type already defined? + //(this is used by dynamic columns with different object type and id's that are openable like attachments and event logs and Review list etc) + if (column.ot) { + columnObject["ot"] = column.ot; + } + o.columns["c" + iColumn.toString()] = columnObject; //Is: //Headers: [ { "text": "Name", "value": "c1" }, { "text": "Serial #", "value": "c2" },