diff --git a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index 998c90556fb07dc7c49edf82981a8546cbdf8422..d9779a6be3453568674ce6fce9b79d69e5464c1e 100644 Binary files a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h index 30341231f423e39c333f846094e392eda3eea9cb..e193bc9e9cdfaf51efee30dc5eb233491c047ad0 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h @@ -30,14 +30,13 @@ */ @interface CISDOBOpenBisModel : NSObject <NSFetchedResultsControllerDelegate> { CISDOBIpadEntity *_selectedObject; - CISDOBOpenBisModel *_parentModel; } @property (strong, nonatomic) NSFetchedResultsController *fetchedResultsController; @property (strong, nonatomic) NSManagedObjectContext *managedObjectContext; @property (weak, nonatomic) id <NSFetchedResultsControllerDelegate> delegate; -@property (readonly) CISDOBOpenBisModel *parentModel; +@property (weak, nonatomic) CISDOBOpenBisModel *parentModel; // Initialize - (id)initWithParentModel:(CISDOBOpenBisModel *)parentModel; diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m index 3bf0b6283ff5371152b6400a3adb9f84ae374698..ddfbed48a3c0235f6b938647830b7f641f1f7b56 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m @@ -23,10 +23,6 @@ #import "CISDOBOpenBisModel.h" #import "CISDOBIpadEntity.h" -@interface CISDOBOpenBisModel (CISDOBOpenBisModelPrivate) -@property (weak, nonatomic) CISDOBOpenBisModel *parentModel; -@end - @implementation CISDOBOpenBisModel #pragma mark - Initialize @@ -34,10 +30,10 @@ { if (!(self = [super init])) return nil; - _parentModel = parentModel; + self.parentModel = parentModel; _selectedObject = nil; - if (_parentModel) { + if (self.parentModel) { self.fetchedResultsController = parentModel.fetchedResultsController; self.managedObjectContext = parentModel.managedObjectContext; }