Merge branch 'pr/186' into develop

2014-08-06 08:45:55 -04:00
parent 17a1577d09 07750c7537
commit 876aea4007
1 changed files with 8 additions and 1 deletions
@@ -73,6 +73,13 @@ namespace Archetype.Models
                if (value2 is T)
                    return Attempt<T>.Succeed((T)value2);

+                // If ConvertDataToSource failed try ConvertSourceToObject.
+                var value3 = converter.ConvertSourceToObject(properyType, value, false);
+
+                // If the value is of type T, just return it
+                if (value3 is T)
+                    return Attempt<T>.Succeed((T)value3);
+
                // Value is not final value type, so try a regular type conversion aswell
                var convertAttempt = value2.TryConvertTo<T>();
                if (convertAttempt.Success)
@@ -82,4 +89,4 @@ namespace Archetype.Models
            return Attempt<T>.Fail();
        }
    }
-}
+}