Merge pull request #216 from leekelleher/feature/courier-upgrade

Courier upgrade (UaaS)
2014-09-02 08:58:20 -04:00
parent b5f281cae0 ca52f0a216
commit 8fe90c3b86
4 changed files with 4 additions and 12 deletions
@@ -77,7 +77,7 @@ namespace Archetype.Courier.DataResolvers
 			if (propertyData != null && propertyData.Value != null)
 			{
 				// just look at the amount of dancing around we have to do in order to fake a `PublishedPropertyType`?!
-				var dataTypeId = PersistenceManager.Default.GetNodeId(propertyData.DataType, NodeObjectTypes.DataType);
+				var dataTypeId = ExecutionContext.DatabasePersistence.GetNodeId(propertyData.DataType, NodeObjectTypes.DataType);
 				var fakePropertyType = this.CreateDummyPropertyType(dataTypeId, this.EditorAlias);

 				var converter = new ArchetypeValueConverter();
@@ -103,7 +103,7 @@ namespace Archetype.Courier.DataResolvers
 								new ContentProperty
 								{
 									Alias = property.Alias,
-									DataType = PersistenceManager.Default.GetUniqueId(property.DataTypeId, NodeObjectTypes.DataType),
+									DataType = ExecutionContext.DatabasePersistence.GetUniqueId(property.DataTypeId, NodeObjectTypes.DataType),
 									PropertyEditorAlias = property.PropertyEditorAlias,
 									Value = property.Value
 								}
@@ -154,16 +154,8 @@ namespace Archetype.Courier.DataResolvers
 						}
 					}

-					if (item.Name.Contains(string.Concat(this.EditorAlias, ": Nested")))
-					{
-						// if the Archetype is nested, then we only want to return the object itself - not a serialized string
-						propertyData.Value = archetype;
-					}
-					else
-					{
-						// if the Archetype is the root/container, then we can serialize it to a string
-						propertyData.Value = archetype.SerializeForPersistence();
-					}
+					// serialize the Archetype back to a string
+					propertyData.Value = archetype.SerializeForPersistence();
 				}
 			}
 		}