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

Merge branch 'master' into upstream-master 

Conflicts:
	code/SiteTreeContentReview.php
This commit is contained in:
Ingo Schommer 2013-01-07 13:55:31 +01:00
parent 278f5da18f 1240467033
commit b2eb26da15
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ContentReviewEmails.php
View File

@ -31,7 +31,7 @@ class ContentReviewEmails extends DailyTask {
$email->setTemplate('ContentReviewEmails'); $email->setTemplate('ContentReviewEmails');
$email->setSubject($subject); $email->setSubject($subject);
$email->populateTemplate(array( $email->populateTemplate(array(
"PageCMSLink" => "admin/show/".$page->ID, "PageCMSLink" => "admin/pages/edit/show/".$page->ID,
"Recipient" => $recipient, "Recipient" => $recipient,
"Sender" => $sender, "Sender" => $sender,
"Page" => $page, "Page" => $page,

2
code/SiteTreeContentReview.php
View File

@ -42,7 +42,7 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
DateField::create( DateField::create(
"NextReviewDate", "NextReviewDate",
_t("SiteTreeCMSWorkflow.NEXTREVIEWDATE", "Next review date (leave blank for no review)") _t("SiteTreeCMSWorkflow.NEXTREVIEWDATE", "Next review date (leave blank for no review)")
)->setConfig('showcalendar', true), )->setConfig('showcalendar', true)->setConfig('dateformat', 'yyyy-MM-dd')->setConfig('datavalueformat', 'yyyy-MM-dd'),
new DropdownField("ReviewPeriodDays", _t("SiteTreeCMSWorkflow.REVIEWFREQUENCY", new DropdownField("ReviewPeriodDays", _t("SiteTreeCMSWorkflow.REVIEWFREQUENCY",
"Review frequency (the review date will be set to this far in the future whenever the page is published.)"), array( "Review frequency (the review date will be set to this far in the future whenever the page is published.)"), array(
0 => "No automatic review date", 0 => "No automatic review date",