aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2008-12-08 01:34:24 +0000
committerrowanbeentje <rowan@beent.je>2008-12-08 01:34:24 +0000
commit20a22bbffa77ab514210d9defa01afd7bb0bba3a (patch)
tree0d2c8437d8ab73849ef412f3d74477d311c2030c
parent2d18384fb11c4a3ae1e2752f58d573d99d7154a4 (diff)
downloadsequelpro-20a22bbffa77ab514210d9defa01afd7bb0bba3a.tar.gz
sequelpro-20a22bbffa77ab514210d9defa01afd7bb0bba3a.tar.bz2
sequelpro-20a22bbffa77ab514210d9defa01afd7bb0bba3a.zip
Fix a regression for CSV field mapping caused by r233 - SVN merged TableDump and evidently decided my version was newer without declaring it a conflict. Fixed.
-rw-r--r--TableDump.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/TableDump.m b/TableDump.m
index 859bc233..de7b30db 100644
--- a/TableDump.m
+++ b/TableDump.m
@@ -519,9 +519,9 @@
[buttonCell setFont:[NSFont labelFontOfSize:[NSFont smallSystemFontSize]]];
[buttonCell setBordered:NO];
[buttonCell addItemWithTitle:NSLocalizedString(@"Do not import", @"text for csv import drop downs")];
- [buttonCell addItemsWithTitles:[tableSourceInstance fieldNames]];
+ [buttonCell addItemsWithTitles:[importArray objectAtIndex:currentRow]];
- [[fieldMappingTableView tableColumnWithIdentifier:@"1"] setDataCell:buttonCell];
+ [[fieldMappingTableView tableColumnWithIdentifier:@"value"] setDataCell:buttonCell];
// show fieldMapping sheet
[NSApp beginSheet:fieldMappingSheet