Skip to content

Commit 648f5fd

Browse files
committed
Update for use with current RestKit development bits
1 parent ec13e3e commit 648f5fd

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

Code/RKFetchedResultsTableController.m

+11-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#import "RKEntityMapping.h"
2626
#import "RKLog.h"
2727
#import "RKManagedObjectRequestOperation.h"
28-
#import "NSEntityDescription+RKAdditions.h"
2928
#import "RKObjectManager.h"
3029

3130
// Define logging component
@@ -468,18 +467,16 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
468467
if (self.canEditRows && editingStyle == UITableViewCellEditingStyleDelete) {
469468
NSManagedObject *managedObject = [self objectForRowAtIndexPath:indexPath];
470469

471-
NSString *primaryKeyAttributeName = managedObject.entity.primaryKeyAttributeName;
472-
if ([managedObject valueForKeyPath:primaryKeyAttributeName]) {
473-
// TODO: This should probably be done via delegation. We are coupled to the shared manager.
474-
RKLogTrace(@"About to fire a delete request for managedObject: %@", managedObject);
475-
[[RKObjectManager sharedManager] deleteObject:managedObject path:nil parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
476-
if ([self.delegate respondsToSelector:@selector(tableController:didDeleteObject:atIndexPath:)]) {
477-
[self.delegate tableController:self didDeleteObject:managedObject atIndexPath:indexPath];
478-
}
479-
} failure:^(RKObjectRequestOperation *operation, NSError *error) {
480-
RKLogError(@"Failed to delete managed object deleted by table controller. Error: %@", error);
481-
}];
482-
} else {
470+
// TODO: This should probably be done via delegation. We are coupled to the shared manager.
471+
RKLogTrace(@"About to fire a delete request for managedObject: %@", managedObject);
472+
[[RKObjectManager sharedManager] deleteObject:managedObject path:nil parameters:nil success:^(RKObjectRequestOperation *operation, RKMappingResult *mappingResult) {
473+
if ([self.delegate respondsToSelector:@selector(tableController:didDeleteObject:atIndexPath:)]) {
474+
[self.delegate tableController:self didDeleteObject:managedObject atIndexPath:indexPath];
475+
}
476+
} failure:^(RKObjectRequestOperation *operation, NSError *error) {
477+
RKLogError(@"Failed to delete managed object deleted by table controller. Error: %@", error);
478+
479+
// TODO: This incorrect. Its not a great assumption.
483480
RKLogTrace(@"About to locally delete managedObject: %@", managedObject);
484481
NSManagedObjectContext *managedObjectContext = managedObject.managedObjectContext;
485482
[managedObjectContext performBlock:^{
@@ -495,7 +492,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
495492
}
496493
}
497494
}];
498-
}
495+
}];
499496
}
500497
}
501498

0 commit comments

Comments
 (0)