Skip to content

Fixed sorting sections not following sortingEnabled and canDeleteRows… #735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkuziel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed sorting sections not following sortingEnabled and canDeleteRows… #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quickdialog/QSortingSection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ - (QSortingSection *)init {
}

- (BOOL)needsEditing {
return _sortingEnabled;
return _sortingEnabled || _canDeleteRows;
}

- (void)fetchValueIntoObject:(id)obj {
Expand All @@ -58,6 +58,6 @@ - (BOOL)removeElementForRow:(NSInteger)index {
}

- (BOOL)canRemoveElementForRow:(NSInteger)integer {
return YES;
return _canDeleteRows;
}
@end
5 changes: 3 additions & 2 deletions quickdialog/QuickDialogDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ - (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInte
}

- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
return [[_tableView.root getVisibleSectionForIndex:indexPath.section] isKindOfClass:[QSortingSection class]];
id section = [_tableView.root getVisibleSectionForIndex:indexPath.section];
return [section isKindOfClass:[QSortingSection class]] && [section sortingEnabled];
}


Expand Down Expand Up @@ -85,7 +86,7 @@ - (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)sou
- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
QSection *section = [_tableView.root getVisibleSectionForIndex: indexPath.section];
if ([section isKindOfClass:[QSortingSection class]]){
return ([(QSortingSection *) section canRemoveElementForRow:indexPath.row]);
return ([(QSortingSection *) section canRemoveElementForRow:indexPath.row]) || ((QSortingSection*)section).sortingEnabled;
}
return tableView.editing;
}
Expand Down
1 change: 1 addition & 0 deletions sample/SampleDataBuilder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ + (QRootElement *)createSortingRoot {
QSortingSection *sortingSection = [[QSortingSection alloc] init];
sortingSection.key = @"sortedSection";
sortingSection.canDeleteRows = YES;
sortingSection.sortingEnabled = YES;
[sortingSection addElement:[[QLabelElement alloc] initWithTitle:@"First" Value:@"1"]];
[sortingSection addElement:[[QLabelElement alloc] initWithTitle:@"Second" Value:@"2"]];
[sortingSection addElement:[[QLabelElement alloc] initWithTitle:@"Third" Value:@"3"]];
Expand Down