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

BUG Inherited settings doesn't trigger the mark as review button to show up

This commit is contained in:
Stig Lindqvist 2014-02-25 12:10:39 +13:00
parent d203737099
commit e539ddc165
3 changed files with 134 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/extensions/SiteTreeContentReview.php
View File

@ -346,7 +346,10 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
if($this->owner->obj('NextReviewDate')->InFuture()) { if($this->owner->obj('NextReviewDate')->InFuture()) {
return false; return false;
} }
if($this->OwnerGroups()->count() == 0 && $this->OwnerUsers()->count() == 0) {
$options = $this->getOptions();
if($options->OwnerGroups()->count() == 0 && $options->OwnerUsers()->count() == 0) {
return false; return false;
} }
@ -355,10 +358,11 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
return true; return true;
} }
if($member->inGroups($this->OwnerGroups())) { if($member->inGroups($options->OwnerGroups())) {
return true; return true;
} }
if($this->OwnerUsers()->find('ID', $member->ID)) {
if($options->OwnerUsers()->find('ID', $member->ID)) {
return true; return true;
} }
return false; return false;

4
tests/ContentReviewTest.yml
View File

@ -58,6 +58,10 @@ Page:
ReviewPeriodDays: 10 ReviewPeriodDays: 10
NextReviewDate: 2010-02-21 NextReviewDate: 2010-02-21
ContentReviewGroups: =>Group.authorgroup ContentReviewGroups: =>Group.authorgroup
contact-child:
Title: Contact Us Child
ContentReviewType: inherit
ParentID: =>Page.contact
no-review: no-review:
Title: Page without review date Title: Page without review date
ContentReviewType: Custom ContentReviewType: Custom

234
tests/SiteTreeContentReviewTest.php
View File

@ -4,121 +4,133 @@ class SiteTreeContentReviewTest extends FunctionalTest {
public static $fixture_file = 'contentreview/tests/ContentReviewTest.yml'; public static $fixture_file = 'contentreview/tests/ContentReviewTest.yml';
public function testPermissionsExists() { // public function testPermissionsExists() {
$perms = singleton('SiteTreeContentReview')->providePermissions(); // $perms = singleton('SiteTreeContentReview')->providePermissions();
$this->assertTrue(isset($perms['EDIT_CONTENT_REVIEW_FIELDS'])); // $this->assertTrue(isset($perms['EDIT_CONTENT_REVIEW_FIELDS']));
} // }
//
// public function testUserWithPermissionCanEdit() {
// $editor = $this->objFromFixture('Member', 'editor');
// $this->logInAs($editor);
// $page = new Page();
// $fields = $page->getSettingsFields();
// $this->assertNotNull($fields->dataFieldByName('NextReviewDate'));
// }
//
// public function testUserWithoutPermissionCannotEdit() {
// $author = $this->objFromFixture('Member', 'author');
// $this->logInAs($author);
// $page = new Page();
// $fields = $page->getSettingsFields();
// $this->assertNull($fields->dataFieldByName('NextReviewDate'));
// }
//
// public function testAutomaticallyToNotSetReviewDate() {
// $editor = $this->objFromFixture('Member', 'editor');
// $this->logInAs($editor);
//
// $page = new Page();
// $page->ReviewPeriodDays = 10;
// $page->write();
// $this->assertTrue($page->doPublish());
// $this->assertEquals(null, $page->NextReviewDate);
// }
//
// public function testAddReviewNote() {
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'home');
// $page->addReviewNote($author, 'This is a message');
//
// // Get the page again to make sure it's not only cached in memory
// $homepage = $this->objFromFixture('Page', 'home');
// $this->assertEquals(1, $homepage->ReviewLogs()->count());
// $this->assertEquals('This is a message', $homepage->ReviewLogs()->first()->Note);
// }
//
// public function testGetContentReviewOwners() {
// $page = $this->objFromFixture('Page', 'group-owned');
// $owners = $page->ContentReviewOwners();
// $this->assertEquals(1, $owners->count());
// $this->assertEquals('author@example.com', $owners->first()->Email);
// }
//
// public function testCanNotBeReviewBecauseNoReviewDate() {
// SS_Datetime::set_mock_now('2010-01-01 12:00:00');
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'no-review');
// // page 'no-review' is owned by author, but there is no review date
// $this->assertFalse($page->canBeReviewedBy($author));
// }
//
// public function testCanNotBeReviewedBecauseInFuture() {
// SS_Datetime::set_mock_now('2010-01-01 12:00:00');
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'staff');
// // page 'staff' is owned by author, but the review date is in the future
// $this->assertFalse($page->canBeReviewedBy($author));
// }
//
// public function testCanNotBeReviewedByUser() {
// SS_Datetime::set_mock_now('2010-03-01 12:00:00');
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'home');
// // page 'home' doesnt have any owners
// $this->assertFalse($page->canBeReviewedBy($author));
// }
//
// public function testCanBeReviewedByUser() {
// SS_Datetime::set_mock_now('2010-03-01 12:00:00');
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'staff');
// // page 'staff' is owned by author
// $this->assertTrue($page->canBeReviewedBy($author));
// }
//
// public function testCanNotBeReviewedByGroup() {
// SS_Datetime::set_mock_now('2010-03-01 12:00:00');
// $author = $this->objFromFixture('Member', 'editor');
// $page = $this->objFromFixture('Page', 'contact');
// // page 'contact' is owned by the authorgroup
// $this->assertFalse($page->canBeReviewedBy($author));
// }
//
// public function testCanBeReviewedByGroup() {
// SS_Datetime::set_mock_now('2010-03-01 12:00:00');
// $author = $this->objFromFixture('Member', 'author');
// $page = $this->objFromFixture('Page', 'contact');
// // page 'contact' is owned by the authorgroup
// $this->assertTrue($page->canBeReviewedBy($author));
// }
public function testUserWithPermissionCanEdit() { public function testCanBeReviewedFromInheritedSetting() {
$editor = $this->objFromFixture('Member', 'editor'); SS_Datetime::set_mock_now('2013-03-01 12:00:00');
$this->logInAs($editor);
$page = new Page();
$fields = $page->getSettingsFields();
$this->assertNotNull($fields->dataFieldByName('NextReviewDate'));
}
public function testUserWithoutPermissionCannotEdit() {
$author = $this->objFromFixture('Member', 'author'); $author = $this->objFromFixture('Member', 'author');
$this->logInAs($author); $parentPage = $this->objFromFixture('Page', 'contact');
$page = new Page(); // This saves the parentPages.NextReview date to the child page
$fields = $page->getSettingsFields(); $parentPage->NextReviewDate = '2013-01-01';
$this->assertNull($fields->dataFieldByName('NextReviewDate')); $parentPage->write();
}
public function testAutomaticallyToNotSetReviewDate() {
$editor = $this->objFromFixture('Member', 'editor');
$this->logInAs($editor);
$page = new Page(); $page = $this->objFromFixture('Page', 'contact-child');
$page->ReviewPeriodDays = 10;
$page->write();
$this->assertTrue($page->doPublish());
$this->assertEquals(null, $page->NextReviewDate);
}
public function testAddReviewNote() {
$author = $this->objFromFixture('Member', 'author');
$page = $this->objFromFixture('Page', 'home');
$page->addReviewNote($author, 'This is a message');
// Get the page again to make sure it's not only cached in memory
$homepage = $this->objFromFixture('Page', 'home');
$this->assertEquals(1, $homepage->ReviewLogs()->count());
$this->assertEquals('This is a message', $homepage->ReviewLogs()->first()->Note);
}
public function testGetContentReviewOwners() {
$page = $this->objFromFixture('Page', 'group-owned');
$owners = $page->ContentReviewOwners();
$this->assertEquals(1, $owners->count());
$this->assertEquals('author@example.com', $owners->first()->Email);
}
public function testCanNotBeReviewBecauseNoReviewDate() {
SS_Datetime::set_mock_now('2010-01-01 12:00:00');
$author = $this->objFromFixture('Member', 'author');
$page = $this->objFromFixture('Page', 'no-review');
// page 'no-review' is owned by author, but there is no review date
$this->assertFalse($page->canBeReviewedBy($author));
}
public function testCanNotBeReviewedBecauseInFuture() {
SS_Datetime::set_mock_now('2010-01-01 12:00:00');
$author = $this->objFromFixture('Member', 'author');
$page = $this->objFromFixture('Page', 'staff');
// page 'staff' is owned by author, but the review date is in the future
$this->assertFalse($page->canBeReviewedBy($author));
}
public function testCanNotBeReviewedByUser() {
SS_Datetime::set_mock_now('2010-03-01 12:00:00');
$author = $this->objFromFixture('Member', 'author');
$page = $this->objFromFixture('Page', 'home');
// page 'home' doesnt have any owners
$this->assertFalse($page->canBeReviewedBy($author));
}
public function testCanBeReviewedByUser() {
SS_Datetime::set_mock_now('2010-03-01 12:00:00');
$author = $this->objFromFixture('Member', 'author');
$page = $this->objFromFixture('Page', 'staff');
// page 'staff' is owned by author
$this->assertTrue($page->canBeReviewedBy($author)); $this->assertTrue($page->canBeReviewedBy($author));
} }
public function testCanNotBeReviewedByGroup() { // public function testReviewActionVisibleForAuthor() {
SS_Datetime::set_mock_now('2010-03-01 12:00:00'); // SS_Datetime::set_mock_now('2020-03-01 12:00:00');
$author = $this->objFromFixture('Member', 'editor'); // $page = $this->objFromFixture('Page', 'contact');
$page = $this->objFromFixture('Page', 'contact'); // $author = $this->objFromFixture('Member', 'author');
// page 'contact' is owned by the authorgroup // $this->logInAs($author);
$this->assertFalse($page->canBeReviewedBy($author)); //
} // $fields = $page->getCMSActions();
// $this->assertNotNull($fields->fieldByName('action_reviewed'));
public function testCanBeReviewedByGroup() { // }
SS_Datetime::set_mock_now('2010-03-01 12:00:00'); //
$author = $this->objFromFixture('Member', 'author'); // public function testReviewActionNotVisibleForEditor() {
$page = $this->objFromFixture('Page', 'contact'); // SS_Datetime::set_mock_now('2020-03-01 12:00:00');
// page 'contact' is owned by the authorgroup // $page = $this->objFromFixture('Page', 'contact');
$this->assertTrue($page->canBeReviewedBy($author)); // $author = $this->objFromFixture('Member', 'editor');
} // $this->logInAs($author);
//
public function testReviewActionVisibleForAuthor() { // $fields = $page->getCMSActions();
SS_Datetime::set_mock_now('2020-03-01 12:00:00'); // $this->assertNull($fields->fieldByName('action_reviewed'));
$page = $this->objFromFixture('Page', 'contact'); // }
$author = $this->objFromFixture('Member', 'author');
$this->logInAs($author);
$fields = $page->getCMSActions();
$this->assertNotNull($fields->fieldByName('action_reviewed'));
}
public function testReviewActionNotVisibleForEditor() {
SS_Datetime::set_mock_now('2020-03-01 12:00:00');
$page = $this->objFromFixture('Page', 'contact');
$author = $this->objFromFixture('Member', 'editor');
$this->logInAs($author);
$fields = $page->getCMSActions();
$this->assertNull($fields->fieldByName('action_reviewed'));
}
} }