From 317bf3ad37a3544408d797f6e9223eb8c5b2f055 Mon Sep 17 00:00:00 2001 From: Leszek Pietrzak Date: Tue, 12 Feb 2019 22:55:11 +0100 Subject: [PATCH 1/3] safety check if $autoname exists --- jsapp/js/components/table.es6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsapp/js/components/table.es6 b/jsapp/js/components/table.es6 index da81f334cd..dc154a9cf8 100644 --- a/jsapp/js/components/table.es6 +++ b/jsapp/js/components/table.es6 @@ -173,7 +173,9 @@ export class DataTable extends React.Component { const surveyKeys = []; this.props.asset.content.survey.forEach((row) => { - surveyKeys.push(row.$autoname); + if (row.$autoname) { + surveyKeys.push(row.$autoname); + } }); // make sure the survey columns are displayed, even if current data's From dfb853e6c50e2928a9e1651c5ddb46b857214463 Mon Sep 17 00:00:00 2001 From: Leszek Pietrzak Date: Tue, 12 Feb 2019 23:52:43 +0100 Subject: [PATCH 2/3] check name and $autoname --- jsapp/js/components/table.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsapp/js/components/table.es6 b/jsapp/js/components/table.es6 index dc154a9cf8..de9b2d2c5b 100644 --- a/jsapp/js/components/table.es6 +++ b/jsapp/js/components/table.es6 @@ -173,7 +173,9 @@ export class DataTable extends React.Component { const surveyKeys = []; this.props.asset.content.survey.forEach((row) => { - if (row.$autoname) { + if (row.name) { + surveyKeys.push(row.name); + } else if (row.$autoname) { surveyKeys.push(row.$autoname); } }); @@ -765,6 +767,8 @@ export class DataTable extends React.Component { selectAll = this.state.selectAll; var d = null; + // TODO bulk change to no status + if (!selectAll) { d = { submissions_ids: Object.keys(this.state.selectedRows), From 66a5bf2ae863c94333bab19ad54d1ea558cff8f4 Mon Sep 17 00:00:00 2001 From: "John N. Milner" Date: Tue, 12 Feb 2019 23:57:23 -0500 Subject: [PATCH 3/3] Fix crash in table view with missing responses --- jsapp/js/components/table.es6 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsapp/js/components/table.es6 b/jsapp/js/components/table.es6 index de9b2d2c5b..e79b11cb15 100644 --- a/jsapp/js/components/table.es6 +++ b/jsapp/js/components/table.es6 @@ -417,7 +417,11 @@ export class DataTable extends React.Component { return formatTimeDate(row.value); } } - return typeof(row.value) == 'object' ? '' : row.value; + if (typeof(row.value) == 'object' || row.value === undefined) { + return ''; + } else { + return row.value; + } } });