Skip to content

Fixed Varien_Data_Form_Filter_Date::inputFilter() and Varien_Data_Form_Filter_Datetime::inputFilter() dealing with empty values #3752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 27, 2024
Merged

Fixed Varien_Data_Form_Filter_Date::inputFilter() and Varien_Data_Form_Filter_Datetime::inputFilter() dealing with empty values #3752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6baea6
bugfix(validations): fix date and datetime filters with empty values
massa-man Jan 23, 2024
2d54163
Add @massa-man as a contributor
massa-man Jan 23, 2024
7531381
chore(readme): re-instate deleted contrbutor
massa-man Jan 25, 2024
0e7dd07
Merge branch 'main' into fix-3751
massa-man Jan 25, 2024
12023de
Merge branch 'main' into fix-3751
massa-man Jan 26, 2024
8e62387
bugfix(filters): improve condition check for filter input value
massa-man Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .all-contributorsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,6 +1427,15 @@
"contributions": [
"code"
]
},
{
"login": "massa-man",
"name": "Marcos Steverlynck",
"avatar_url": "https://avatars.githubusercontent.com/u/26821235?v=4",
"profile": "https://www.riseart.com/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/seifer7"><img src="https://avatars.githubusercontent.com/u/13601073?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Kane</b></sub></a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Sdfendor"><img src="https://avatars.githubusercontent.com/u/2728018?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Kevin Jakob</b></sub></a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/leissbua"><img src="https://avatars.githubusercontent.com/u/68073221?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>leissbua</b></sub></a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.riseart.com/"><img src="https://avatars.githubusercontent.com/u/26821235?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Marcos Steverlynck</b></sub></a></td>
</tr>
</tbody>
</table>
Expand Down
8 changes: 8 additions & 0 deletions lib/Varien/Data/Form/Filter/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public function __construct($format = null, $locale = null)
*/
public function inputFilter($value)
{
if ($value === null || $value === '') {
return $value;
}

$filterInput = new Zend_Filter_LocalizedToNormalized([
'date_format' => $this->_dateFormat,
'locale' => $this->_locale
Expand All @@ -80,6 +84,10 @@ public function inputFilter($value)
*/
public function outputFilter($value)
{
if ($value === null || $value === '') {
return $value;
}

$filterInput = new Zend_Filter_LocalizedToNormalized([
'date_format' => Varien_Date::DATE_INTERNAL_FORMAT,
'locale' => $this->_locale
Expand Down
8 changes: 8 additions & 0 deletions lib/Varien/Data/Form/Filter/Datetime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ class Varien_Data_Form_Filter_Datetime extends Varien_Data_Form_Filter_Date
*/
public function inputFilter($value)
{
if ($value === null || $value === '') {
return $value;
}

$filterInput = new Zend_Filter_LocalizedToNormalized([
'date_format' => $this->_dateFormat,
'locale' => $this->_locale
Expand All @@ -51,6 +55,10 @@ public function inputFilter($value)
*/
public function outputFilter($value)
{
if ($value === null || $value === '') {
return $value;
}

$filterInput = new Zend_Filter_LocalizedToNormalized([
'date_format' => Varien_Date::DATETIME_INTERNAL_FORMAT,
'locale' => $this->_locale
Expand Down