Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions jsapp/js/components/table.es6
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ export class DataTable extends React.Component {

const surveyKeys = [];
this.props.asset.content.survey.forEach((row) => {
surveyKeys.push(row.$autoname);
if (row.name) {
surveyKeys.push(row.name);
} else if (row.$autoname) {
surveyKeys.push(row.$autoname);
}
});

// make sure the survey columns are displayed, even if current data's
Expand Down Expand Up @@ -413,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;
}
}
});

Expand Down Expand Up @@ -763,6 +771,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),
Expand Down