Skip to content

Commit c78e8e6

Browse files
committed
MAGETWO-70327: Customer admin grid incorrectly filters by Date of Birth field
1 parent 7cb20bb commit c78e8e6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
<settings>
231231
<timezone>false</timezone>
232232
<dateFormat>MMM d, y</dateFormat>
233-
<skipTime>true</skipTime>
233+
<skipTimeZoneConversion>true</skipTimeZoneConversion>
234234
<filter>dateRange</filter>
235235
<dataType>date</dataType>
236236
<label translate="true">Date of Birth</label>

app/code/Magento/Ui/Component/Filters/Type/Date.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function applyFilter()
8383
$this->applyFilterByType(
8484
'gteq',
8585
$this->wrappedComponent->convertDate(
86-
$value['from'],0, 0, 0, !$this->getData('config/skipTime')
86+
$value['from'],0, 0, 0, !$this->getData('config/skipTimeZoneConversion')
8787
)
8888
);
8989
}
@@ -92,7 +92,7 @@ protected function applyFilter()
9292
$this->applyFilterByType(
9393
'lteq',
9494
$this->wrappedComponent->convertDate(
95-
$value['to'], 23, 59, 59, !$this->getData('config/skipTime')
95+
$value['to'], 23, 59, 59, !$this->getData('config/skipTimeZoneConversion')
9696
)
9797
);
9898
}

app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<item name="dateFormat" type="string" xsi:type="xpath">settings/dateFormat</item>
129129
<item name="timeFormat" type="string" xsi:type="xpath">settings/timeFormat</item>
130130
<item name="timezone" type="string" xsi:type="xpath">settings/timezone</item>
131-
<item name="skipTime" type="boolean" xsi:type="xpath">settings/skipTime</item>
131+
<item name="skipTimeZoneConversion" type="boolean" xsi:type="xpath">settings/skipTimeZoneConversion</item>
132132
<item name="editor" xsi:type="array">
133133
<item name="editorType" type="string" xsi:type="xpath">settings/editor/editorType</item>
134134
<item name="validation" type="item" xsi:type="converter">settings/editor/validation</item>
@@ -240,7 +240,7 @@
240240
<item name="showsTime" type="boolean" xsi:type="xpath">settings/showsTime</item>
241241
<item name="dateFormat" type="string" xsi:type="xpath">settings/dateFormat</item>
242242
<item name="timeFormat" type="string" xsi:type="xpath">settings/timeFormat</item>
243-
<item name="skipTime" type="string" xsi:type="xpath">settings/skipTime</item>
243+
<item name="skipTimeZoneConversion" type="string" xsi:type="xpath">settings/skipTimeZoneConversion</item>
244244
</item>
245245
</argument>
246246
</schema>

app/code/Magento/Ui/view/base/ui_component/etc/definition/column.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</xs:annotation>
9999
</xs:element>
100100
<xs:element name="timeFormat" type="xs:string"/>
101-
<xs:element name="skipTime" type="xs:boolean">
101+
<xs:element name="skipTimeZoneConversion" type="xs:boolean">
102102
<xs:annotation>
103103
<xs:documentation>
104104
For the Date column: If time not important for filtering.

0 commit comments

Comments
 (0)