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 343bdfe2144a42664af0c494361bfa9c15991743..e1fbbb66e794753300527cb69f3646d44d874c4e 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/CISDOBMasterViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m index 4f137838ea003a5b8b597f94107f43b4fb040147..e1148cd87e3cae6e19bea07a835d12d426f5d61b 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m @@ -127,9 +127,9 @@ // Segue to the detail view unless we are on the ipad if ([[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad) return; - // Drill into the hierarchy [self.openBisModel selectObjectAtIndexPath: indexPath]; - if ([self.openBisModel isSelectionGroup]) { + if ([self.openBisModel selectionHasChildren]) { + // Drill into the hierarchy UIStoryboard *storyboard = self.storyboard; CISDOBMasterViewController *child = [storyboard instantiateViewControllerWithIdentifier: @"Master"]; [child initializeDrillDownFrom: self]; diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h index 61f4919277006330fba1742339221a2e3cf7f4f3..7c36841974c144870ce8540586d01164a8c0514e 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h @@ -52,7 +52,7 @@ //! Select the object and return it - (CISDOBIpadEntity *)selectObjectAtIndexPath:(NSIndexPath *)indexPath; -- (BOOL)isSelectionGroup; //!< Return YES if the selected object is a group (has children) +- (BOOL)selectionHasChildren; //!< Return YES if the selected object is a group (has children) // Actions - (BOOL)insertNewObjectOrError:(NSError **)error; //!< Return YES if operation succeeded diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m index f6d4162b082a891ade69631defdd73709c8f0b13..4c25449ba290b3b46a981b1051b62897f3df1dbb 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m @@ -81,7 +81,7 @@ return _selectedObject; } -- (BOOL)isSelectionGroup +- (BOOL)selectionHasChildren { return [_selectedObject.childrenPermIds count] > 0; }