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 d199bf20f38be6841c033b9bebb507d03723cc76..6357e97f0c763da8619029307aa7bafb2f520e62 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/CISDOBDetailViewController.m b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m index b210be3c7e6394923bf5487499c926381844d828..1a001e8665ad8d3d7695559c8c821a2773f980e6 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBDetailViewController.m @@ -69,11 +69,11 @@ // The detail item is now up-to-date. Update the user interface. if (!self.detailItem) return; - self.summaryHeaderLabel.text = [self.detailItem.summaryHeader description]; - self.summaryLabel.text = [self.detailItem.summary description]; - self.identifierLabel.text = [self.detailItem.identifier description]; + self.summaryHeaderLabel.text = self.detailItem.summaryHeader; + self.summaryLabel.text = self.detailItem.summary; + self.identifierLabel.text = self.detailItem.identifier; - if (self.detailItem.image) { + if (self.imageView.image != self.detailItem.image) { self.imageView.image = self.detailItem.image; } diff --git a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m index b96ba398f4890b19b3678d286023ea811aca9152..317edfe395633357f5489596384c0aaa06a7497c 100644 --- a/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m +++ b/openbis-ipad/openBIS/openBIS/CISDOBOpenBisModel.m @@ -91,12 +91,15 @@ #pragma mark - Server Communication - (void)syncSelectedObjectOnSuccess:(SuccessBlock)success { - // Update the image - if (_selectedObject.imageUrl) { - NSURL *imageUrl = [NSURL URLWithString: _selectedObject.imageUrl]; - NSData *imageData = [NSData dataWithContentsOfURL: imageUrl]; - _selectedObject.image = [UIImage imageWithData: imageData]; - success(_selectedObject); + // Load the image if necessary + if (_selectedObject.imageUrl && !_selectedObject.image) { + NSBlockOperation *blockOp = [NSBlockOperation blockOperationWithBlock: ^{ + NSURL *imageUrl = [NSURL URLWithString: _selectedObject.imageUrl]; + NSData *imageData = [NSData dataWithContentsOfURL: imageUrl]; + _selectedObject.image = [UIImage imageWithData: imageData]; + success(_selectedObject); + }]; + [blockOp start]; } else { success(_selectedObject); }