tonyair/silverstripe-contentreview
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-contentreview synced 2024-10-22 17:05:47 +02:00
Code Issues Projects Releases Wiki Activity

Simplified the Pages due for review report #12

Browse Source
This commit is contained in:
Stig Lindqvist 2014-02-25 20:36:26 +13:00
parent 21b6b05fb7
commit 8c5e91addc
1 changed files with 11 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
code/reports/PagesDueForReviewReport.php
View File

@ -21,59 +21,20 @@ class PagesDueForReviewReport extends SS_Report {
* @return \FieldList * @return \FieldList
*/ */
public function parameterFields() { public function parameterFields() {
$params = new FieldList(); $filtersList = new FieldList();
// We need to be a bit fancier when subsites is enabled $filtersList->push(
// if(class_exists('Subsite') && $subsites = DataObject::get('Subsite')) {
//
// throw new Exception('feature missing, check with subsites');
// // javascript for subsite specific owner dropdown
// Requirements::javascript(THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js');
// Requirements::javascript('contentreview/javascript/PagesDueForReview.js');
//
// // Remember current subsite
// $existingSubsite = Subsite::currentSubsiteID();
//
// $map = array();
//
// // Create a map of all potential owners from all applicable sites
// $sites = Subsite::accessible_sites('CMS_ACCESS_CMSMain');
// foreach($sites as $site) {
// Subsite::changeSubsite($site);
//
// $cmsUsers = Permission::get_members_by_permission(array("CMS_ACCESS_CMSMain", "ADMIN"));
// // Key-preserving merge
// foreach($cmsUsers->map('ID', 'Title') as $k => $v) {
// $map[$k] = $v;
// }
// }
//
// $map = $map + array('' => 'Any', '-1' => '(no owner)');
//
// $params->push(new DropdownField("ContentReviewOwnerID", 'Page owner', $map));
//
// // Restore current subsite
// Subsite::changeSubsite($existingSubsite);
// } else {
$cmsUsers = Permission::get_members_by_permission(array("CMS_ACCESS_CMSMain", "ADMIN"));
$map = $cmsUsers->map('ID', 'Title', '(no owner)')->toArray();
unset($map['']);
$map = array('' => 'Any', '-1' => '(no owner)') + $map;
$params->push(new DropdownField("ContentReviewOwnerID", 'Page owner', $map));
// }
$params->push(
DateField::create('ReviewDateAfter', 'Review date after or on') DateField::create('ReviewDateAfter', 'Review date after or on')
->setConfig('showcalendar', true) ->setConfig('showcalendar', true)
); );
$params->push( $filtersList->push(
DateField::create('ReviewDateBefore', 'Review date before or on', date('d/m/Y', strtotime('midnight'))) DateField::create('ReviewDateBefore', 'Review date before or on', date('d/m/Y', strtotime('midnight')))
->setConfig('showcalendar', true) ->setConfig('showcalendar', true)
); );
$params->push(new CheckboxField('ShowVirtualPages', 'Show Virtual Pages')); $filtersList->push(new CheckboxField('ShowVirtualPages', 'Show Virtual Pages'));
return $params; return $filtersList;
} }
/** /**
@ -82,8 +43,6 @@ class PagesDueForReviewReport extends SS_Report {
*/ */
public function columns() { public function columns() {
Versioned::reading_stage('Stage');
$linkBase = singleton('CMSPageEditController')->Link('show') . '/'; $linkBase = singleton('CMSPageEditController')->Link('show') . '/';
$fields = array( $fields = array(
@ -109,20 +68,7 @@ class PagesDueForReviewReport extends SS_Report {
} }
), ),
'OwnerNames' => array( 'OwnerNames' => array(
'title' => 'Owner', 'title' => 'Owner'
'formatting' => function($value, $item) {
if($item->ContentReviewType == 'Disabled') {
return 'disabled';
}
if($item->ContentReviewType == 'Inherit') {
$setting = $item->getOptions();
if(!$setting) {
return 'disabled';
}
return $setting->getOwnerNames();
}
return $value;
}
), ),
'LastEditedByName' => 'Last edited by', 'LastEditedByName' => 'Last edited by',
'AbsoluteLink' => array( 'AbsoluteLink' => array(
@ -164,6 +110,7 @@ class PagesDueForReviewReport extends SS_Report {
* @return DataList * @return DataList
*/ */
public function sourceRecords($params, $sort, $limit) { public function sourceRecords($params, $sort, $limit) {
Versioned::reading_stage('Stage');
$records = SiteTree::get(); $records = SiteTree::get();
if(empty($params['ReviewDateBefore']) && empty($params['ReviewDateAfter'])) { if(empty($params['ReviewDateBefore']) && empty($params['ReviewDateAfter'])) {
@ -198,31 +145,11 @@ class PagesDueForReviewReport extends SS_Report {
} }
// Owner dropdown // Owner dropdown
if(!empty($params['ContentReviewOwnerID'])) { if(!empty($params['ContentReviewOwner'])) {
$ownerID = (int)$params['ContentReviewOwnerID']; $ownerNames = Convert::raw2sql($params['ContentReviewOwner']);
// We use -1 here to distinguish between No Owner and Any $records = $records->filter('OwnerNames:PartialMatch', $ownerNames);
if($ownerID == -1) $ownerID = 0;
$records = $records->filter('ContentReviewOwnerID', $ownerID);
} }
// Turn a query into records
// if($sort) {
// $parts = explode(' ', $sort);
// $field = $parts[0];
// $direction = $parts[1];
//
// if($field == 'AbsoluteLink') {
// $sort = '"URLSegment" ' . $direction;
// } elseif($field == 'Subsite.Title') {
// $records = $records->leftJoin("Subsite", '"Subsite"."ID" = "SiteTree"."SubsiteID"');
// }
//
// if($field != "LastEditedByName") {
// $records = $records->sort($sort);
// }
//
// if($limit) $records = $records->limit($limit['limit'], $limit['start']);
// }
return $records->sort('NextReviewDate', 'DESC'); return $records->sort('NextReviewDate', 'DESC');
} }
} }