diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPTableContent.m | 10 | ||||
| -rw-r--r-- | Source/SPTablesList.m | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 73441466..26cdb96b 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -371,6 +371,14 @@ // Clear restoration settings [self clearDetailsToRestore]; + // Clear filter table + while ([[filterTableView tableColumns] count]) { + [filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)]; + } + // Clear filter table data + [filterTableData removeAllObjects]; + [filterTableWhereClause setString:@""]; + activeFilter = 0; return; } @@ -381,6 +389,7 @@ [tableContentView removeTableColumn:NSArrayObjectAtIndex([tableContentView tableColumns], 0)]; } // Remove existing columns from the filter table + [filterTableView abortEditing]; while ([[filterTableView tableColumns] count]) { [filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)]; } @@ -504,6 +513,7 @@ [filterTableView setDelegate:self]; [filterTableView setDataSource:self]; + [filterTableView reloadData]; // If the table has been reloaded and the previously selected sort column is still present, reselect it. if (sortColumnNumberToRestore) { diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index c9192147..9f409e57 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -1516,9 +1516,6 @@ - (void)tableViewSelectionDidChange:(NSNotification *)aNotification { - // Clear Content's Filter Table - [tableContentInstance tableFilterClear:nil]; - if([tablesListView selectedRow] < 0) { // Reset all if (selectedTableName) [selectedTableName release]; |