Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API

nul800sebastiaan · nul800sebastiaan · commit 010d47c68b84 · 2013-09-30T10:23:43.000+02:00
diff --git a/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs b/src/Umbraco.Core/Models/Rdbms/PropertyDataDto.cs
@@ -65,12 +65,12 @@ public object GetValue
                     return Date.Value;
                 }
                 
-                if(!string.IsNullOrEmpty(VarChar))
+                if(string.IsNullOrEmpty(VarChar) == false)
                 {
                     return VarChar;
                 }
 
-                if(!string.IsNullOrEmpty(Text))
+                if(string.IsNullOrEmpty(Text) == false)
                 {
                     return Text;
                 }
diff --git a/src/umbraco.editorControls/datepicker/DateData.cs b/src/umbraco.editorControls/datepicker/DateData.cs
@@ -11,10 +11,17 @@ public DateData(cms.businesslogic.datatype.BaseDataType DataType) : base(DataTyp
 
 		public override System.Xml.XmlNode ToXMl(System.Xml.XmlDocument d)
 		{
-			if (Value != null && Value.ToString() != "")
-				return d.CreateTextNode(((DateTime) Value).ToString("s"));
-			else
-				return d.CreateTextNode("");
+		    if (Value != null && Value.ToString() != "")
+		    {
+                if(Value is DateTime)
+		            return d.CreateTextNode(((DateTime) Value).ToString("s"));
+
+		        DateTime convertedDate;
+                if (DateTime.TryParse(Value.ToString(), out convertedDate))
+                    return d.CreateTextNode(convertedDate.ToString("s"));
+		    }
+            
+            return d.CreateTextNode("");
 		}
 
 		public override void MakeNew(int PropertyId) 

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ public object GetValue`
`65`	`65`	`return Date.Value;`
`66`	`66`	`}`
`67`	`67`
`68`		`- if(!string.IsNullOrEmpty(VarChar))`
	`68`	`+ if(string.IsNullOrEmpty(VarChar) == false)`
`69`	`69`	`{`
`70`	`70`	`return VarChar;`
`71`	`71`	`}`
`72`	`72`
`73`		`- if(!string.IsNullOrEmpty(Text))`
	`73`	`+ if(string.IsNullOrEmpty(Text) == false)`
`74`	`74`	`{`
`75`	`75`	`return Text;`
`76`	`76`	`}`