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

Fix incorrect usage of data list methods.

This commit is contained in:
Andrew Short 2013-09-25 22:35:38 +10:00
parent 6a9dca2786
commit 90db01d259
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/PagesDueForReviewReport.php
View File

@ -107,28 +107,28 @@ class PagesDueForReviewReport extends SS_Report {
// If there's no review dates set, default to all pages due for review now // If there's no review dates set, default to all pages due for review now
$reviewDate = new Zend_Date(SS_Datetime::now()->Format('U')); $reviewDate = new Zend_Date(SS_Datetime::now()->Format('U'));
$reviewDate->add(1, Zend_Date::DAY); $reviewDate->add(1, Zend_Date::DAY);
$records->where(sprintf('"NextReviewDate" < \'%s\'', $reviewDate->toString('YYYY-MM-dd'))); $records = $records->where(sprintf('"NextReviewDate" < \'%s\'', $reviewDate->toString('YYYY-MM-dd')));
} else { } else {
// Review date before // Review date before
if(!empty($params['ReviewDateBefore'])) { if(!empty($params['ReviewDateBefore'])) {
// TODO Get value from DateField->dataValue() once we have access to form elements here // TODO Get value from DateField->dataValue() once we have access to form elements here
$reviewDate = new Zend_Date($params['ReviewDateBefore'], i18n::get_date_format()); $reviewDate = new Zend_Date($params['ReviewDateBefore'], i18n::get_date_format());
$reviewDate->add(1, Zend_Date::DAY); $reviewDate->add(1, Zend_Date::DAY);
$records->where(sprintf('"NextReviewDate" < \'%s\'', $reviewDate->toString('YYYY-MM-dd'))); $records = $records->where(sprintf('"NextReviewDate" < \'%s\'', $reviewDate->toString('YYYY-MM-dd')));
} }
// Review date after // Review date after
if(!empty($params['ReviewDateAfter'])) { if(!empty($params['ReviewDateAfter'])) {
// TODO Get value from DateField->dataValue() once we have access to form elements here // TODO Get value from DateField->dataValue() once we have access to form elements here
$reviewDate = new Zend_Date($params['ReviewDateAfter'], i18n::get_date_format()); $reviewDate = new Zend_Date($params['ReviewDateAfter'], i18n::get_date_format());
$records->where(sprintf('"NextReviewDate" >= \'%s\'', $reviewDate->toString('YYYY-MM-dd'))); $records = $records->where(sprintf('"NextReviewDate" >= \'%s\'', $reviewDate->toString('YYYY-MM-dd')));
} }
} }
// Show virtual pages? // Show virtual pages?
if(empty($params['ShowVirtualPages'])) { if(empty($params['ShowVirtualPages'])) {
$virtualPageClasses = ClassInfo::subclassesFor('VirtualPage'); $virtualPageClasses = ClassInfo::subclassesFor('VirtualPage');
$records->where(sprintf( $records = $records->where(sprintf(
'"SiteTree"."ClassName" NOT IN (\'%s\')', '"SiteTree"."ClassName" NOT IN (\'%s\')',
implode("','", array_values($virtualPageClasses)) implode("','", array_values($virtualPageClasses))
)); ));
@ -139,7 +139,7 @@ class PagesDueForReviewReport extends SS_Report {
$ownerID = (int)$params['ContentReviewOwnerID']; $ownerID = (int)$params['ContentReviewOwnerID'];
// We use -1 here to distinguish between No Owner and Any // We use -1 here to distinguish between No Owner and Any
if($ownerID == -1) $ownerID = 0; if($ownerID == -1) $ownerID = 0;
$records->addFilter(array('ContentReviewOwnerID' => $ownerID)); $records = $records->filter('ContentReviewOwnerID', $ownerID);
} }
// Turn a query into records // Turn a query into records
@ -151,14 +151,14 @@ class PagesDueForReviewReport extends SS_Report {
if($field == 'AbsoluteLink') { if($field == 'AbsoluteLink') {
$sort = '"URLSegment" ' . $direction; $sort = '"URLSegment" ' . $direction;
} elseif($field == 'Subsite.Title') { } elseif($field == 'Subsite.Title') {
$records->leftJoin("Subsite", '"Subsite"."ID" = "SiteTree"."SubsiteID"'); $records = $records->leftJoin("Subsite", '"Subsite"."ID" = "SiteTree"."SubsiteID"');
} }
if($field != "LastEditedByName") { if($field != "LastEditedByName") {
$records->sort($sort); $records = $records->sort($sort);
} }
if($limit) $records->limit($limit['limit'], $limit['start']); if($limit) $records = $records->limit($limit['limit'], $limit['start']);
} }
return $records; return $records;