Merge pull request #217 from Orckestra/fix-bugs

Fixing issue where EntityToken creation fail for page with 2+ versions
Orckestra · Sep 5, 2016 · 26adb1d · 26adb1d
2 parents e283850 + b7046e9
commit 26adb1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Composite/C1Console/Trees/Foundation/AttachmentPoints/DynamicDataItemAttachmentPoint.cs b/Composite/C1Console/Trees/Foundation/AttachmentPoints/DynamicDataItemAttachmentPoint.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
+using System.Linq;
 using Composite.Data;
 using Composite.C1Console.Security;
 using Composite.Data.ProcessControlled;
 
-
 namespace Composite.C1Console.Trees.Foundation.AttachmentPoints
 {
     /// <summary>
@@ -69,7 +69,7 @@ public override IEnumerable<EntityToken> GetEntityTokens(EntityToken childEntity
 
         private EntityToken GetEntityTokensImpl()
         {
-            IData data = DataFacade.TryGetDataByUniqueKey(this.InterfaceType, KeyValue);
+            IData data = DataFacade.TryGetDataVersionsByUniqueKey(this.InterfaceType, KeyValue).FirstOrDefault();
             return data == null ? null : data.GetDataEntityToken();
         }