File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
Component/Listing/Columns
view/base/web/js/grid/columns Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -109,7 +109,6 @@ public function prepare()
109
109
'months ' => $ months ,
110
110
'monthsShort ' => $ monthsShort ,
111
111
];
112
- $ config ['dateFormat ' ] = $ this ->timezone ->getDateTimeFormat (\IntlDateFormatter::MEDIUM );
113
112
$ this ->setData ('config ' , $ config );
114
113
115
114
parent ::prepare ();
Original file line number Diff line number Diff line change @@ -38,10 +38,11 @@ define([
38
38
* @returns {String } Formatted date.
39
39
*/
40
40
getLabel : function ( value , format ) {
41
+ var date ;
41
42
if ( this . storeLocale !== undefined ) {
42
43
moment . locale ( this . storeLocale , utils . extend ( { } , this . calendarConfig ) ) ;
43
44
}
44
- var date = moment ( this . _super ( ) ) ;
45
+ date = moment ( this . _super ( ) ) ;
45
46
46
47
date = date . isValid ( ) && value [ this . index ] ?
47
48
date . format ( format || this . dateFormat ) :
You can’t perform that action at this time.
0 commit comments