mirror of
https://github.com/zhigang1992/RestKit.git
synced 2026-04-23 12:27:52 +08:00
fix for breakage introduced during merge
This commit is contained in:
@@ -101,8 +101,7 @@ static DBUser* currentUser = nil;
|
||||
RKObjectLoader* objectLoader = [[RKObjectManager sharedManager] objectLoaderWithResourcePath:@"/login" delegate:self];
|
||||
objectLoader.method = RKRequestMethodPOST;
|
||||
objectLoader.params = [NSDictionary dictionaryWithKeysAndObjects:@"user[username]", username, @"user[password]", password, nil];
|
||||
objectLoader.targetObject = self;
|
||||
objectLoader.managedObjectStore = [RKObjectManager sharedManager].objectStore;
|
||||
objectLoader.targetObject = self;
|
||||
[objectLoader send];
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ static NSString* const kDBAccessTokenHTTPHeaderField = @"X-USER-ACCESS-TOKEN";
|
||||
|
||||
// Set the default refresh rate to 1. This means we should always hit the web if we can.
|
||||
// If the server is unavailable, we will load from the Core Data cache.
|
||||
[RKRequestTTModel setDefaultRefreshRate:1];
|
||||
// [RKRequestTTModel setDefaultRefreshRate:1];
|
||||
|
||||
// Set nil for any attributes we expect to appear in the payload, but do not
|
||||
objectManager.mapper.missingElementMappingPolicy = RKSetNilForMissingElementMappingPolicy;
|
||||
|
||||
@@ -62,6 +62,13 @@
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
|
||||
proxyType = 2;
|
||||
remoteGlobalIDString = 73057FD11331AD2E001908EE;
|
||||
remoteInfo = "RestKitJSONParser+JSONKit";
|
||||
};
|
||||
3F2562F812DBA4C800AFD2D1 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */;
|
||||
@@ -1069,6 +1076,7 @@
|
||||
A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */,
|
||||
A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */,
|
||||
A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */,
|
||||
25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */,
|
||||
A7A2D3B512D7822D00683D6F /* libRestKitCoreData.a */,
|
||||
A7A2D3B712D7822D00683D6F /* libRestKitThree20.a */,
|
||||
A7A2D3B912D7822D00683D6F /* UISpec.app */,
|
||||
@@ -1133,6 +1141,13 @@
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXReferenceProxy section */
|
||||
25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
path = libRestKitJSONParserJSONKit.a;
|
||||
remoteRef = 25825AF31337CEAC00C0E3D2 /* PBXContainerItemProxy */;
|
||||
sourceTree = BUILT_PRODUCTS_DIR;
|
||||
};
|
||||
A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */ = {
|
||||
isa = PBXReferenceProxy;
|
||||
fileType = archive.ar;
|
||||
|
||||
Reference in New Issue
Block a user