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 3ed6eb0971 into cd1b9ed9f2

Browse Source
This commit is contained in:
Steve Boyd 2024-10-15 01:19:51 +00:00 committed by GitHub
commit aee13af0c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Extensions/SiteTreeContentReview.php
View File

@ -194,7 +194,7 @@ class SiteTreeContentReview extends Extension implements PermissionProvider
* *
* @param SiteTree $page * @param SiteTree $page
* *
* @return bool|DBDate * @return null|DBDate
*/ */
public function getReviewDate(SiteTree $page = null) public function getReviewDate(SiteTree $page = null)
{ {
@ -209,11 +209,11 @@ class SiteTreeContentReview extends Extension implements PermissionProvider
$options = $this->owner->getOptions(); $options = $this->owner->getOptions();
if (!$options) { if (!$options) {
return false; return null;
} }
if (!$options->ReviewPeriodDays) { if (!$options->ReviewPeriodDays) {
return false; return null;
} }
// Failover to check on ReviewPeriodDays + LastEdited // Failover to check on ReviewPeriodDays + LastEdited
@ -509,6 +509,9 @@ class SiteTreeContentReview extends Extension implements PermissionProvider
DBDatetime::now()->getTimestamp() DBDatetime::now()->getTimestamp()
); );
$x=DBDate::create()->setValue($nextDateTimestamp)->Format(DBDate::ISO_DATE);
;
$this->owner->NextReviewDate = DBDate::create()->setValue($nextDateTimestamp)->Format(DBDate::ISO_DATE); $this->owner->NextReviewDate = DBDate::create()->setValue($nextDateTimestamp)->Format(DBDate::ISO_DATE);
$this->owner->write(); $this->owner->write();
} }
@ -662,6 +665,8 @@ class SiteTreeContentReview extends Extension implements PermissionProvider
if (is_object($nextDate)) { if (is_object($nextDate)) {
$this->owner->NextReviewDate = $nextDate->getValue(); $this->owner->NextReviewDate = $nextDate->getValue();
} elseif ($nextDate === false) {
$this->owner->NextReviewDate = null;
} else { } else {
$this->owner->NextReviewDate = $nextDate; $this->owner->NextReviewDate = $nextDate;
} }