Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-20 23:36:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(mail-merge): Preserve linked tokens when importing new csv

Browse source 
- If the new imported csv contains columns with the same name as the
imported one, any tokens linked to those columns will be preserved
- Any tokens linked to columns that no longer exist will be removed
- Other fixes
This commit is contained in:
Juan Tejada 2016-05-02 12:15:56 -07:00
parent 953931a628
commit 80f7cdab71
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/editable-table.jsx
View file

@ -66,8 +66,8 @@ class EditableCell extends Component {
}
render() {
const {rowIdx, colIdx, tableData: {rows}, isHeader, inputProps, InputRenderer} = this.props
const cellValue = rows[rowIdx][colIdx] || ''
const {rowIdx, colIdx, tableData, isHeader, inputProps, InputRenderer} = this.props
const cellValue = tableData.rows[rowIdx][colIdx] || ''
return (
<SelectableCell ref="cell" {...this.props}>
@ -76,6 +76,7 @@ class EditableCell extends Component {
type="text"
rowIdx={rowIdx}
colIdx={colIdx}
tableData={tableData}
isHeader={isHeader}
defaultValue={cellValue}
onBlur={::this.onInputBlur}

2
src/pro

@ -1 +1 @@
Subproject commit c1346c184b4628109bfd47fbd667f0961a130999
Subproject commit c62ed6110a8c161c838188019c8d33273a129c50