diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h index 5a93a3d26d5cf3b932f3b06059984aca32aabeaf..ce1436917ec1a874539a3785aa30aba438f67085 100644 --- a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h +++ b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.h @@ -49,7 +49,7 @@ @property (nonatomic, retain) NSString * summary; @property (nonatomic, retain) NSString * identifier; @property (nonatomic, retain) NSString * category; -@property (nonatomic, retain) NSString * imageUrl; +@property (nonatomic, retain) NSString * imageUrlString; @property (nonatomic, retain) NSString * childrenPermIdsJson; @property (readonly) NSArray * childrenPermIds; @@ -59,8 +59,6 @@ @property (nonatomic, retain) NSNumber * rootLevel; -///! The image contained at the imageUrl or nil if there is no image. Could be a UIImage or CIImage depending on the platform. -@property (nonatomic, strong) id image; // Actions //! Take the values from the raw entity. diff --git a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m index 0a4c2d1a85ceb8bfce37df84fd666beb133ea2a1..5d811d23bcf5c2fa6e3bc433535bb75f2ee9362e 100644 --- a/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m +++ b/openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m @@ -41,15 +41,13 @@ id ObjectFromJsonData(NSString *jsonData, NSError **error) @dynamic permId; @dynamic refconJson; @dynamic category; -@dynamic imageUrl; +@dynamic imageUrlString; @dynamic childrenPermIdsJson; @dynamic propertiesJson; @dynamic rootLevel; @dynamic serverUrlString; @dynamic lastUpdateDate; -@synthesize image; - - (void)setRefconJson:(NSString *)refconJson { // Update the object value as well. @@ -141,7 +139,7 @@ id ObjectFromJsonData(NSString *jsonData, NSError **error) if (rawEntity.summary) self.summary = rawEntity.summary; if (rawEntity.children) self.childrenPermIdsJson = rawEntity.children; if (rawEntity.identifier) self.identifier = rawEntity.identifier; - if (rawEntity.imageUrl) self.imageUrl = rawEntity.imageUrl; + if (rawEntity.imageUrl) self.imageUrlString = rawEntity.imageUrl; if (rawEntity.properties) self.propertiesJson = rawEntity.properties; if (rawEntity.rootLevel) { BOOL rootLevel = [rawEntity.rootLevel length] > 0; diff --git a/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents b/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents index 156f3a1b4565e729eaab3f04fdbc9efd16a794be..4d2005a53413a5693a54856acc51ff99186632c6 100644 --- a/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents +++ b/openbis-ipad/BisKit/Classes/persistent-data-model.xcdatamodeld/persistent-data-model.xcdatamodel/contents @@ -5,7 +5,7 @@ <attribute name="childrenPermIds" optional="YES" transient="YES" syncable="YES"/> <attribute name="childrenPermIdsJson" optional="YES" attributeType="String" indexed="YES" syncable="YES"/> <attribute name="identifier" optional="YES" attributeType="String" indexed="YES" syncable="YES"/> - <attribute name="imageUrl" optional="YES" attributeType="String" syncable="YES"/> + <attribute name="imageUrlString" optional="YES" attributeType="String" syncable="YES"/> <attribute name="lastUpdateDate" optional="YES" attributeType="Date" indexed="YES" syncable="YES"/> <attribute name="permId" optional="YES" attributeType="String" indexed="YES" syncable="YES"/> <attribute name="properties" optional="YES" transient="YES" syncable="YES"/> @@ -22,6 +22,6 @@ <fetchRequest name="EntityAndChildren" entity="CISDOBIpadEntity" predicateString="SELF == $ENTITY OR permId IN $CHILDREN" fetchBatchSize="20"/> <fetchRequest name="RootEntities" entity="CISDOBIpadEntity" predicateString="rootLevel == 0" fetchBatchSize="20"/> <elements> - <element name="CISDOBIpadEntity" positionX="0" positionY="0" width="128" height="270"/> + <element name="CISDOBIpadEntity" positionX="0" positionY="0" width="0" height="0"/> </elements> </model> \ No newline at end of file