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

Merge remote-tracking branch 'matt/pulls/reporting-url-fix' into cwp-support

Browse Source
This commit is contained in:
Igor Nadj 2015-09-11 15:33:50 +12:00
commit 2b98e7b7d9
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/reports/PagesDueForReviewReport.php
View File

@ -43,12 +43,15 @@ class PagesDueForReviewReport extends SS_Report {
*/ */
public function columns() { public function columns() {
$linkBase = singleton('CMSPageEditController')->Link('show') . '/'; $linkBase = singleton('CMSPageEditController')->Link('show');
$linkPath = parse_url($linkBase, PHP_URL_PATH);
$linkQuery = parse_url($linkBase, PHP_URL_QUERY);
$fields = array( $fields = array(
'Title' => array( 'Title' => array(
'title' => 'Page name', 'title' => 'Page name',
'formatting' => '<a href=\"' . $linkBase . '/$ID\" title=\"Edit page\">$value</a>' 'formatting' => sprintf('<a href=\"%s/$ID?%s\" title=\"Edit page\">$value</a>', $linkPath, $linkQuery)
), ),
'NextReviewDate' => array( 'NextReviewDate' => array(
'title' => 'Review Date', 'title' => 'Review Date',
@ -85,13 +88,19 @@ class PagesDueForReviewReport extends SS_Report {
), ),
'ContentReviewType' => array( 'ContentReviewType' => array(
'title' => 'Settings are', 'title' => 'Settings are',
'formatting' => function($value, $item) use($linkBase) { 'formatting' => function($value, $item) use($linkPath, $linkQuery) {
if($item->ContentReviewType == 'Inherit') { if($item->ContentReviewType == 'Inherit') {
$options = $item->getOptions(); $options = $item->getOptions();
if($options && $options instanceof SiteConfig) { if($options && $options instanceof SiteConfig) {
return 'Inherited from <a href="admin/settings">Settings</a>'; return 'Inherited from <a href="admin/settings">Settings</a>';
} elseif($options) { } elseif($options) {
return 'Inherited from <a href="'.$linkBase.$options->ID.'">'.$options->Title.'</a>'; return sprintf(
'Inherited from <a href="%s/%d?%s">%s</a>',
$linkPath,
$options->ID,
$linkQuery,
$options->Title
);
} }
} }
return $value; return $value;

17
code/reports/PagesWithoutReviewScheduleReport.php
View File

@ -31,11 +31,14 @@ class PagesWithoutReviewScheduleReport extends SS_Report {
* @return array * @return array
*/ */
public function columns() { public function columns() {
$linkBase = singleton('CMSPageEditController')->Link('show') . '/'; $linkBase = singleton('CMSPageEditController')->Link('show');
$linkPath = parse_url($linkBase, PHP_URL_PATH);
$linkQuery = parse_url($linkBase, PHP_URL_QUERY);
$fields = array( $fields = array(
'Title' => array( 'Title' => array(
'title' => 'Page name', 'title' => 'Page name',
'formatting' => '<a href=\"' . $linkBase . '/$ID\" title=\"Edit page\">$value</a>' 'formatting' => sprintf('<a href=\"%s/$ID?%s\" title=\"Edit page\">$value</a>', $linkPath, $linkQuery)
), ),
'NextReviewDate' => array( 'NextReviewDate' => array(
'title' => 'Review Date', 'title' => 'Review Date',
@ -59,13 +62,19 @@ class PagesWithoutReviewScheduleReport extends SS_Report {
), ),
'ContentReviewType' => array( 'ContentReviewType' => array(
'title' => 'Settings are', 'title' => 'Settings are',
'formatting' => function($value, $item) use($linkBase) { 'formatting' => function($value, $item) use($linkPath, $linkQuery) {
if($item->ContentReviewType == 'Inherit') { if($item->ContentReviewType == 'Inherit') {
$options = $item->getOptions(); $options = $item->getOptions();
if($options && $options instanceof SiteConfig) { if($options && $options instanceof SiteConfig) {
return 'Inherited from <a href="admin/settings">Settings</a>'; return 'Inherited from <a href="admin/settings">Settings</a>';
} elseif($options) { } elseif($options) {
return 'Inherited from <a href="'.$linkBase.$options->ID.'">'.$options->Title.'</a>'; return sprintf(
'Inherited from <a href="%s/%d?%s">%s</a>',
$linkPath,
$options->ID,
$linkQuery,
$options->Title
);
} }
} }
return $value; return $value;