MC-5233: DateTime product attributes support

serhii-balko · serhii-balko · commit a9f42f9ed40a · 2019-10-08T15:43:47.000+03:00
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
@@ -40,12 +40,14 @@ define([
          * @returns {String} Formatted date.
          */
         getLabel: function (value, format) {
-            var date = moment.utc(this._super());
+            var date;
 
             if (this.storeLocale !== undefined) {
                 moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
             }
 
+            date = moment.utc(this._super());
+
             if (!_.isUndefined(this.timezone)) {
                 date = date.tz(this.timezone);
             }

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,14 @@ define([`
`40`	`40`	`* @returns {String} Formatted date.`
`41`	`41`	`*/`
`42`	`42`	`getLabel: function (value, format) {`
`43`		`- var date = moment.utc(this._super());`
	`43`	`+ var date;`
`44`	`44`
`45`	`45`	`if (this.storeLocale !== undefined) {`
`46`	`46`	`moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ date = moment.utc(this._super());`
	`50`	`+`
`49`	`51`	`if (!_.isUndefined(this.timezone)) {`
`50`	`52`	`date = date.tz(this.timezone);`
`51`	`53`	`}`