tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUG: Narrowing site tree search to one date shows no pages 

It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
This commit is contained in:
Stig Lindqvist 2014-07-24 14:34:06 +12:00
parent a1286f1c0f
commit 3eefd65f7c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/CMSSiteTreeFilter.php
View File

@ -153,12 +153,12 @@ abstract class CMSSiteTreeFilter extends Object {
case 'LastEditedFrom':
$fromDate = new DateField(null, null, $val);
$query = $query->filter("LastEdited:GreaterThanOrEqual", $fromDate->dataValue());
$query = $query->filter("LastEdited:GreaterThanOrEqual", $fromDate->dataValue().' 00:00:00');
break;
case 'LastEditedTo':
$toDate = new DateField(null, null, $val);
$query = $query->filter("LastEdited:LessThanOrEqual", $toDate->dataValue());
$query = $query->filter("LastEdited:LessThanOrEqual", $toDate->dataValue().' 23:59:59');
break;
case 'ClassName':

14
tests/controller/CMSSiteTreeFilterTest.php
View File

@ -114,7 +114,19 @@ class CMSSiteTreeFilterTest extends SapphireTest {
$f = new CMSSiteTreeFilter_StatusDraftPages();
$draftPage->delete();
$this->assertEmpty($f->isPageIncluded($draftPage));
}
}
public function testDateFromToLastSameDate() {
$draftPage = $this->objFromFixture('Page', 'page4');
// Grab the date
$date = substr($draftPage->LastEdited, 0, 10);
// Filter with that date
$filter = New CMSSiteTreeFilter_Search(array(
'LastEditedFrom' => $date,
'LastEditedTo' => $date
));
$this->assertTrue($filter->isPageIncluded($draftPage), 'Using the same date for from and to should show find that page');
}
public function testStatusRemovedFromDraftFilter() {
$removedDraftPage = $this->objFromFixture('Page', 'page6');