Preparation for the model hierarchy. Update the detail view when a drill down is selected.

SVN: 27177

openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.h

@@ -35,6 +35,7 @@
 @property (weak, nonatomic) IBOutlet UIImageView *imageView;
 
 // Actions
-- (void)selectionDidChange;
+- (void)selectionDidChange;     //!< Signals that the user has made a final selction
+- (void)selectionIsChanging;    //!< Signals that the user has changed the seleciton, but has not yet decided
 
 @end

openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m

@@ -56,6 +56,13 @@
     }
 }
 
+- (void)selectionIsChanging
+{
+    // Update the view, but do not dissmiss the popover
+    [self configureViewProvisionally];
+    [self requestServerSync];
+}
+
 - (CISDOBIpadEntity *)detailItem { return [self.openBisModel selectedObject]; }
 
 - (void)configureViewProvisionally

openbis-ipad/openBIS/openBIS/CISDOBMasterViewController.m

@@ -54,7 +54,6 @@
 //    UIBarButtonItem *addButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(insertNewObject:)];
 //    self.navigationItem.rightBarButtonItem = addButton;
     self.detailViewController = (CISDOBDetailViewController *)[[self.splitViewController.viewControllers lastObject] topViewController];
-    self.detailViewController.openBisModel = self.openBisModel;
 }
 
 - (void)didReceiveMemoryWarning
@@ -128,17 +127,19 @@
     // 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]) {
         UIStoryboard *storyboard = self.storyboard;
         CISDOBMasterViewController *child = [storyboard instantiateViewControllerWithIdentifier: @"Master"];
         [child initializeDrillDownFrom: self];
-
         [self.navigationController pushViewController: child animated: YES];
+        [self.detailViewController selectionIsChanging];
     } else {
+        // Show the current selection
+        self.detailViewController.openBisModel = self.openBisModel;
         [self.detailViewController selectionDidChange];
     }
-
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender

openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.h

@@ -39,7 +39,7 @@
 @property (weak, nonatomic) CISDOBOpenBisModel *parentModel;
 
 // Initialize
-- (id)initWithParentModel:(CISDOBOpenBisModel *)parentModel;
+- (id)initWithParentModel:(CISDOBOpenBisModel *)parentModel; //!< The designated initializer
 
 // Model
 - (NSInteger)numberOfSections; //!< Get the number of categories for the current selection

openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m

@@ -26,6 +26,13 @@
 @implementation CISDOBOpenBisModel
 
 #pragma mark - Initialize
+- (id)init
+{
+    if (!(self = [self initWithParentModel: nil])) return nil;
+
+    return self;
+}
+
 - (id)initWithParentModel:(CISDOBOpenBisModel *)parentModel
 {
     if (!(self = [super init])) return nil;

openbis-ipad/openBIS/openBIS/en.lproj/MainStoryboard_iPad.storyboard

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2840" systemVersion="11G56" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2843" systemVersion="11G56" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="5">
     <dependencies>
         <development version="4500" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1926"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1929"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -188,7 +188,7 @@
                             <outlet property="delegate" destination="19" id="21"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="Categories" id="40"/>
+                    <navigationItem key="navigationItem" title="All" id="40"/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="23" sceneMemberID="firstResponder"/>
             </objects>