diff --git a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate index ed740f4fe12bce6caf879191ffe9eb99703ca43e..49c6afc4d35dcb9e33dc36776ac029774c16a2b0 100644 Binary files a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate and b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate differ 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 ab1f6919bf514897442c2501a6e7a5ae383b2895..838eeaeeec4e5e3324e1e1a94f726b4da9c329c7 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 f7199895a96a67f78b30d632dff464140e09fc9b..f23273d3ccaee6ab5532a0440c35e1de2a0142fa 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m @@ -128,7 +128,6 @@ if ([[UIDevice currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad) return; [self.openBisModel selectObjectAtIndexPath: indexPath]; - self.title = self.openBisModel.selectedObject.summaryHeader; // Figure out what to do with the detail view and the navigation view self.detailViewController.openBisModel = self.openBisModel; @@ -166,11 +165,6 @@ } } -- (void)initializeDrillDownFrom:(CISDOBMasterViewController *)parent -{ - self.openBisModel = [[CISDOBOpenBisModel alloc] initWithParentModel: parent.openBisModel]; -} - #pragma mark - Fetched results controller - (void)controllerWillChangeContent:(NSFetchedResultsController *)controller @@ -242,4 +236,11 @@ _openBisModel.delegate = self; } +- (void)initializeDrillDownFrom:(CISDOBMasterViewController *)parent +{ + self.openBisModel = [[CISDOBOpenBisModel alloc] initWithParentModel: parent.openBisModel]; + // The title of the drill-down is the parent's title + self.title = parent.openBisModel.selectedObject.summaryHeader; +} + @end