Skip to content

Commit 8c13b86

Browse files
authored
Merge pull request #840 from Caltech-IPAC/FIREFLY-166_link_substitution_error_handling
FIREFLY-166: fixed condition when Link Substitution fails, table fail to load.
2 parents 6324190 + 3beb806 commit 8c13b86

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/firefly/js/util/VOAnalyzer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ export function resolveHRefVal(tableModel, href='', rowIdx, defval='') {
10751075
vars.forEach((v) => {
10761076
const [,cname] = v.match(/\${([\w -.]+)}/) || [];
10771077
const col = getColumnByID(tableModel, cname) || getColumn(tableModel, cname);
1078-
const rval = getCellValue(tableModel, rowIdx, col.name);
1078+
const rval = col ? getCellValue(tableModel, rowIdx, col.name) : v; // if the variable cannot be resolved, show it as is.
10791079
rhref = rhref.replace(v, rval);
10801080
});
10811081
return rhref;

0 commit comments

Comments
 (0)