aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-02-19 19:16:59 +0000
committerBibiko <bibiko@eva.mpg.de>2010-02-19 19:16:59 +0000
commitba37b377d84cc24052538aad70257fc082c92dca (patch)
treee58220a1380b491cbf217f40a15d1d0b94dd76e2 /Source
parent2583d511db232ca276c1718fbef871880c00625b (diff)
downloadsequelpro-ba37b377d84cc24052538aad70257fc082c92dca.tar.gz
sequelpro-ba37b377d84cc24052538aad70257fc082c92dca.tar.bz2
sequelpro-ba37b377d84cc24052538aad70257fc082c92dca.zip
• removed initial transition of insertion NSNull into table's dataSource from last commit r1824 since that part should be moved maybe into SPTableTextFieldCell
Diffstat (limited to 'Source')
-rw-r--r--Source/SPTextViewAdditions.m8
-rw-r--r--Source/TableContent.m11
2 files changed, 8 insertions, 11 deletions
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index ef0dff38..97c0e07c 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -391,14 +391,6 @@
- (IBAction)insertNULLvalue:(id)sender
{
- // If self is an edited table cell insert [NSNull null] directly in the table's data source
- // TODO: up to now only for CMCopyTable
- if([[[[self delegate] class] description] isEqualToString:@"CMCopyTable"]) {
- id aTableView = [self delegate];
- NSUInteger currentEditedColumn = [aTableView editedColumn];
- NSUInteger currentEditedRow = [aTableView editedRow];
- [[aTableView delegate] tableView:aTableView setObjectValue:[NSNull null] forTableColumn:[[aTableView tableColumns] objectAtIndex:currentEditedColumn] row:currentEditedRow];
- }
id prefs = [NSUserDefaults standardUserDefaults];
if([self respondsToSelector:@selector(insertText:)])
if([prefs objectForKey:SPNullValue] && [[prefs objectForKey:SPNullValue] length])
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 4d878527..a0e2d610 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -2746,12 +2746,17 @@
}
NSDictionary *column = NSArrayObjectAtIndex(dataColumns, [[aTableColumn identifier] integerValue]);
+
+ if (anObject) {
+
+ // Restore NULLs if necessary
+ if ([anObject isEqualToString:[prefs objectForKey:SPNullValue]] && [[column objectForKey:@"null"] boolValue])
+ anObject = [NSNull null];
- if (anObject)
[tableValues replaceObjectInRow:rowIndex column:[[aTableColumn identifier] integerValue] withObject:anObject];
- else
+ } else {
[tableValues replaceObjectInRow:rowIndex column:[[aTableColumn identifier] integerValue] withObject:@""];
-
+ }
}
#pragma mark -