Skip to content

[4.0] More flexible and null value aware datetime range filter in articles model #26581

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 9 commits into from
Oct 16, 2019
Merged

[4.0] More flexible and null value aware datetime range filter in articles model #26581

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9dae4d2
More flexible datetime range filter in article model
richard67 Oct 12, 2019
38a9190
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-dev-articles…
richard67 Oct 13, 2019
1149bc4
PHPCS
richard67 Oct 13, 2019
722900a
Make datetime filter real null value aware
richard67 Oct 13, 2019
3cc59ac
Again PHPCS
richard67 Oct 13, 2019
1b26a15
Merge branch '4.0-dev' into 4.0-dev-articles-model-range-filter
richard67 Oct 13, 2019
f65d468
Fix my own silly mistake
richard67 Oct 14, 2019
1a49ad4
Merge branch '4.0-dev-articles-model-range-filter' of https://github.…
richard67 Oct 14, 2019
40bd2fa
Again fix for my own mistake
richard67 Oct 14, 2019
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
31 changes: 24 additions & 7 deletions components/com_content/Model/ArticlesModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,18 +480,35 @@ function ($data) use ($db)
switch ($dateFiltering)
{
case 'range':
$startDateRange = $db->quote($this->getState('filter.start_date_range'));
$endDateRange = $db->quote($this->getState('filter.end_date_range'));
$query->where(
'(' . $dateField . ' >= ' . $startDateRange . ' AND ' . $dateField .
' <= ' . $endDateRange . ')'
);
$startDateRange = $db->quote($this->getState('filter.start_date_range', ''));
$endDateRange = $db->quote($this->getState('filter.end_date_range', ''));

$startDateRangeUsed = !empty($startDateRange);
$endDateRangeUsed = !empty($endDateRange);

if ($startDateRangeUsed && $endDateRangeUsed)
{
$query->where(
'(' . $dateField . ' IS NOT NULL AND ' . $dateField . ' >= ' . $startDateRange
. ' AND ' . $dateField . ' <= ' . $endDateRange . ')'
);
}
elseif ($startDateRangeUsed)
{
$query->where('(' . $dateField . ' IS NOT NULL AND ' . $dateField . ' >= ' . $startDateRange . ')');
}
elseif ($endDateRangeUsed)
{
$query->where('(' . $dateField . ' IS NOT NULL AND ' . $dateField . ' <= ' . $endDateRange . ')');
}

break;

case 'relative':
$relativeDate = (int) $this->getState('filter.relative_date', 0);
$query->where(
$dateField . ' >= ' . $query->dateAdd($nowDate, -1 * $relativeDate, 'DAY')
'(' . $dateField . ' IS NOT NULL AND '
. $dateField . ' >= ' . $query->dateAdd($nowDate, -1 * $relativeDate, 'DAY') . ')'
);
break;

Expand Down