Skip to content

Commit 523a40c

Browse files
committed
Changed a method to match other classes implementation
1 parent 1838bb5 commit 523a40c

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

Source/SPTableContent.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ - (void)_setViewBlankState
361361
[filterButton setEnabled:NO];
362362
[toggleRuleFilterButton setEnabled:NO];
363363
[toggleRuleFilterButton setState:NSOffState];
364-
[filterControllerInstance updateFiltersFrom:self];
364+
[filterControllerInstance setColumns:nil];
365365

366366
// Disable pagination
367367
[paginationPreviousButton setEnabled:NO];
@@ -636,7 +636,7 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
636636

637637
[filterTableController setColumns:dataColumns];
638638
// Enable and initialize filter fields (with tags for position of menu item and field position)
639-
[filterControllerInstance updateFiltersFrom:self];
639+
[filterControllerInstance setColumns:dataColumns];
640640
// Restore preserved filter settings if appropriate and valid
641641
[filterControllerInstance restoreSerializedFilters:filtersToRestore];
642642
//if we did restore some filters, set filtering enabled

Source/SPTableContentFilterController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ NSString * const SPTableContentFilterHeightChangedNotification;
6565
*/
6666
- (void)focusFirstInputField;
6767

68-
- (void)updateFiltersFrom:(SPTableContent *)tableContent;
68+
- (void)setColumns:(NSArray *)dataColumns;
6969

7070
- (void)openContentFilterManagerForFilterType:(NSString *)filterType;
7171

Source/SPTableContentFilterController.m

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ - (BOOL)_focusOnFieldInSubtree:(NSDictionary *)dict
437437
return NO;
438438
}
439439

440-
- (void)updateFiltersFrom:(SPTableContent *)tableContent
440+
- (void)setColumns:(NSArray *)dataColumns;
441441
{
442442
[self willChangeValueForKey:@"model"]; // manual KVO is needed for filter rule editor to notice change
443443
[model removeAllObjects];
@@ -446,22 +446,22 @@ - (void)updateFiltersFrom:(SPTableContent *)tableContent
446446
[columns removeAllObjects];
447447

448448
//without a table there is nothing to filter
449-
if(![tableContent selectedTable]) return;
450-
451-
//sort column names if enabled
452-
NSArray *columnDefinitions = [tableContent dataColumnDefinitions];
453-
if([[NSUserDefaults standardUserDefaults] boolForKey:SPAlphabeticalTableSorting]) {
454-
NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"name" ascending:YES];
455-
columnDefinitions = [columnDefinitions sortedArrayUsingDescriptors:@[sortDescriptor]];
456-
}
449+
if(dataColumns) {
450+
//sort column names if enabled
451+
NSArray *columnDefinitions = dataColumns;
452+
if ([[NSUserDefaults standardUserDefaults] boolForKey:SPAlphabeticalTableSorting]) {
453+
NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"name" ascending:YES];
454+
columnDefinitions = [columnDefinitions sortedArrayUsingDescriptors:@[sortDescriptor]];
455+
}
457456

458-
// get the columns
459-
for(NSDictionary *colDef in columnDefinitions) {
460-
ColumnNode *node = [[ColumnNode alloc] init];
461-
[node setName:[colDef objectForKey:@"name"]];
462-
[node setTypegrouping:[colDef objectForKey:@"typegrouping"]];
463-
[columns addObject:node];
464-
[node release];
457+
// get the columns
458+
for (NSDictionary *colDef in columnDefinitions) {
459+
ColumnNode *node = [[ColumnNode alloc] init];
460+
[node setName:[colDef objectForKey:@"name"]];
461+
[node setTypegrouping:[colDef objectForKey:@"typegrouping"]];
462+
[columns addObject:node];
463+
[node release];
464+
}
465465
}
466466

467467
// make the rule editor reload the criteria

0 commit comments

Comments
 (0)