DateRange: Fix unexpected use of comma operator (#683)

pimcore · Sep 6, 2024 · 1ba7d2d · 1ba7d2d
1 parent b98d802
commit 1ba7d2d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/public/js/pimcore/object/tags/dateRange.js b/public/js/pimcore/object/tags/dateRange.js
@@ -98,15 +98,16 @@ pimcore.object.tags.dateRange = Class.create(pimcore.object.tags.abstract, {
             renderer: function (key, value, metaData, record) {
                 this.applyPermissionStyle(key, value, metaData, record);
 
-                if (record.data.inheritedFields && record.data.inheritedFields[key] && record.data.inheritedFields[key].inherited === true) {
+                if (record.data.inheritedFields?.[key]?.inherited) {
                     metaData.tdCls += ' grid_value_inherited';
                 }
 
                 if (value) {
                     const minDate = new Date(intval(value['start_date'] || 0) * 1000);
                     const maxDate = new Date(intval(value['end_date'] || 0) * 1000);
+                    const shortDateFormat = pimcore.globalmanager.get('localeDateTime').getShortDateFormat();
 
-                    return `${Ext.Date.format(minDate, pimcore.globalmanager.get('localeDateTime').getShortDateFormat()), Ext.Date.format(maxDate, pimcore.globalmanager.get('localeDateTime').getShortDateFormat())}`;
+                    return `${Ext.Date.format(minDate, shortDateFormat)}, ${Ext.Date.format(maxDate, shortDateFormat)}`;
                 }
 
                 return '';