Merge pull request #4908 in SW/shopware from SW-16361/5.2/fix-article-custom-date-attribute to 5.2

OliverSkroblin · OliverSkroblin · commit 5e917f13f361 · 2017-05-16T13:31:10.000+02:00
* commit '6641138b26f3720a4b98725430901c363a3e493a':
  SW-16361 - Fix article custom datefields format
diff --git a/themes/Backend/ExtJs/backend/base/component/element/date.js b/themes/Backend/ExtJs/backend/base/component/element/date.js
@@ -41,7 +41,7 @@ Ext.define('Shopware.apps.Base.view.element.Date', {
         if(!value) {
             return null;
         } else if (typeof(value) == 'string') {
-            return new Date(value);
+            return (value === "0000-00-00") ? null : new Date(value);
         } else {
             return value;
         }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ Ext.define('Shopware.apps.Base.view.element.Date', {`
`41`	`41`	`if(!value) {`
`42`	`42`	`return null;`
`43`	`43`	`} else if (typeof(value) == 'string') {`
`44`		`- return new Date(value);`
	`44`	`+ return (value === "0000-00-00") ? null : new Date(value);`
`45`	`45`	`} else {`
`46`	`46`	`return value;`
`47`	`47`	`}`