kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-24 04:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into restkit-cache

Browse Source 
Conflicts:
	Code/ObjectMapping/RKObjectManager.m
	Code/Three20/RKRequestFilterableTTModel.h
	Code/Three20/RKRequestModel.m
This commit is contained in:
Jeff Arena
2010-10-18 16:51:58 -04:00
parent 1a6fdeafd4 d9748843ca
commit c3e28d0ecb
4 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Three20/RKRequestFilterableTTModel.h
View File

@@ -23,7 +23,7 @@
/**
* A predicate to filter the model objects by
*/
*/
@property (nonatomic, retain) NSPredicate* predicate;
/**

3
Code/Three20/RKRequestModel.m
View File

@@ -221,8 +221,9 @@
[_delegate rkModelDidStartLoad];
}
_objectLoader = [[[RKObjectManager globalManager] loaderWithResourcePath:_resourcePath objectClass:_objectClass delegate:self] retain];
_objectLoader = [[[RKObjectManager globalManager] objectLoaderWithResourcePath:_resourcePath delegate:self] retain];
_objectLoader.method = _method;
_objectLoader.objectClass = _objectClass;
_objectLoader.keyPath = _keyPath;
_objectLoader.params = _params;
[_objectLoader send];