tonyair/silverstripe-comments
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-comments synced 2024-06-18 10:41:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Workaround for https://github.com/silverstripe/silverstripe-framework/pull/4053

Browse Source
This commit is contained in:
Damian Mooyman 2015-04-01 14:58:03 +13:00
parent a41a0054e2
commit 26d0212ef3
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/dataobjects/Comment.php
View File

@ -336,9 +336,10 @@ class Comment extends DataObject {
* @return string * @return string
*/ */
public function DeleteLink($member = null) { public function DeleteLink($member = null) {
if(!$this->canDelete($member)) return false; if($this->canDelete($member)) {
return $this->actionLink('delete', $member); return $this->actionLink('delete', $member);
} }
}
/** /**
* Link to mark as spam * Link to mark as spam
@ -347,9 +348,10 @@ class Comment extends DataObject {
* @return string * @return string
*/ */
public function SpamLink($member = null) { public function SpamLink($member = null) {
if(!$this->canEdit($member) || $this->IsSpam) return false; if($this->canEdit($member) && !$this->IsSpam) {
return $this->actionLink('spam', $member); return $this->actionLink('spam', $member);
} }
}
/** /**
* Link to mark as not-spam (ham) * Link to mark as not-spam (ham)
@ -358,9 +360,10 @@ class Comment extends DataObject {
* @return string * @return string
*/ */
public function HamLink($member = null) { public function HamLink($member = null) {
if(!$this->canEdit($member) || !$this->IsSpam) return false; if($this->canEdit($member) && $this->IsSpam) {
return $this->actionLink('ham', $member); return $this->actionLink('ham', $member);
} }
}
/** /**
* Link to approve this comment * Link to approve this comment
@ -369,9 +372,10 @@ class Comment extends DataObject {
* @return string * @return string
*/ */
public function ApproveLink($member = null) { public function ApproveLink($member = null) {
if(!$this->canEdit($member) || $this->Moderated) return false; if($this->canEdit($member) && !$this->Moderated) {
return $this->actionLink('approve', $member); return $this->actionLink('approve', $member);
} }
}
/** /**
* @return string * @return string

22
tests/CommentsTest.php
View File

@ -94,7 +94,7 @@ class CommentsTest extends FunctionalTest {
if($member = Member::currentUser()) $member->logOut(); if($member = Member::currentUser()) $member->logOut();
$comment = $this->objFromFixture('Comment', 'firstComA'); $comment = $this->objFromFixture('Comment', 'firstComA');
$commentID = $comment->ID; $commentID = $comment->ID;
$this->assertFalse($comment->DeleteLink(), 'No permission to see delete link'); $this->assertNull($comment->DeleteLink(), 'No permission to see delete link');
$delete = $this->get('CommentingController/delete/'.$comment->ID.'?ajax=1'); $delete = $this->get('CommentingController/delete/'.$comment->ID.'?ajax=1');
$this->assertEquals(403, $delete->getStatusCode()); $this->assertEquals(403, $delete->getStatusCode());
$check = DataObject::get_by_id('Comment', $commentID); $check = DataObject::get_by_id('Comment', $commentID);
@ -102,7 +102,7 @@ class CommentsTest extends FunctionalTest {
// Test non-authenticated user // Test non-authenticated user
$this->logInAs('visitor'); $this->logInAs('visitor');
$this->assertFalse($comment->DeleteLink(), 'No permission to see delete link'); $this->assertNull($comment->DeleteLink(), 'No permission to see delete link');
// Test authenticated user // Test authenticated user
$this->logInAs('commentadmin'); $this->logInAs('commentadmin');
@ -133,7 +133,7 @@ class CommentsTest extends FunctionalTest {
if($member = Member::currentUser()) $member->logOut(); if($member = Member::currentUser()) $member->logOut();
$comment = $this->objFromFixture('Comment', 'firstComA'); $comment = $this->objFromFixture('Comment', 'firstComA');
$commentID = $comment->ID; $commentID = $comment->ID;
$this->assertFalse($comment->SpamLink(), 'No permission to see mark as spam link'); $this->assertNull($comment->SpamLink(), 'No permission to see mark as spam link');
$spam = $this->get('CommentingController/spam/'.$comment->ID.'?ajax=1'); $spam = $this->get('CommentingController/spam/'.$comment->ID.'?ajax=1');
$this->assertEquals(403, $spam->getStatusCode()); $this->assertEquals(403, $spam->getStatusCode());
$check = DataObject::get_by_id('Comment', $commentID); $check = DataObject::get_by_id('Comment', $commentID);
@ -141,7 +141,7 @@ class CommentsTest extends FunctionalTest {
// Test non-authenticated user // Test non-authenticated user
$this->logInAs('visitor'); $this->logInAs('visitor');
$this->assertFalse($comment->SpamLink(), 'No permission to see mark as spam link'); $this->assertNull($comment->SpamLink(), 'No permission to see mark as spam link');
// Test authenticated user // Test authenticated user
$this->logInAs('commentadmin'); $this->logInAs('commentadmin');
@ -167,7 +167,7 @@ class CommentsTest extends FunctionalTest {
$this->assertEquals(1, $check->IsSpam); $this->assertEquals(1, $check->IsSpam);
// Cannot re-spam spammed comment // Cannot re-spam spammed comment
$this->assertFalse($check->SpamLink()); $this->assertNull($check->SpamLink());
} }
public function testHamComment() { public function testHamComment() {
@ -175,7 +175,7 @@ class CommentsTest extends FunctionalTest {
if($member = Member::currentUser()) $member->logOut(); if($member = Member::currentUser()) $member->logOut();
$comment = $this->objFromFixture('Comment', 'secondComC'); $comment = $this->objFromFixture('Comment', 'secondComC');
$commentID = $comment->ID; $commentID = $comment->ID;
$this->assertFalse($comment->HamLink(), 'No permission to see mark as ham link'); $this->assertNull($comment->HamLink(), 'No permission to see mark as ham link');
$ham = $this->get('CommentingController/ham/'.$comment->ID.'?ajax=1'); $ham = $this->get('CommentingController/ham/'.$comment->ID.'?ajax=1');
$this->assertEquals(403, $ham->getStatusCode()); $this->assertEquals(403, $ham->getStatusCode());
$check = DataObject::get_by_id('Comment', $commentID); $check = DataObject::get_by_id('Comment', $commentID);
@ -183,7 +183,7 @@ class CommentsTest extends FunctionalTest {
// Test non-authenticated user // Test non-authenticated user
$this->logInAs('visitor'); $this->logInAs('visitor');
$this->assertFalse($comment->HamLink(), 'No permission to see mark as ham link'); $this->assertNull($comment->HamLink(), 'No permission to see mark as ham link');
// Test authenticated user // Test authenticated user
$this->logInAs('commentadmin'); $this->logInAs('commentadmin');
@ -209,7 +209,7 @@ class CommentsTest extends FunctionalTest {
$this->assertEquals(0, $check->IsSpam); $this->assertEquals(0, $check->IsSpam);
// Cannot re-ham hammed comment // Cannot re-ham hammed comment
$this->assertFalse($check->HamLink()); $this->assertNull($check->HamLink());
} }
public function testApproveComment() { public function testApproveComment() {
@ -217,7 +217,7 @@ class CommentsTest extends FunctionalTest {
if($member = Member::currentUser()) $member->logOut(); if($member = Member::currentUser()) $member->logOut();
$comment = $this->objFromFixture('Comment', 'secondComB'); $comment = $this->objFromFixture('Comment', 'secondComB');
$commentID = $comment->ID; $commentID = $comment->ID;
$this->assertFalse($comment->ApproveLink(), 'No permission to see approve link'); $this->assertNull($comment->ApproveLink(), 'No permission to see approve link');
$approve = $this->get('CommentingController/approve/'.$comment->ID.'?ajax=1'); $approve = $this->get('CommentingController/approve/'.$comment->ID.'?ajax=1');
$this->assertEquals(403, $approve->getStatusCode()); $this->assertEquals(403, $approve->getStatusCode());
$check = DataObject::get_by_id('Comment', $commentID); $check = DataObject::get_by_id('Comment', $commentID);
@ -225,7 +225,7 @@ class CommentsTest extends FunctionalTest {
// Test non-authenticated user // Test non-authenticated user
$this->logInAs('visitor'); $this->logInAs('visitor');
$this->assertFalse($comment->ApproveLink(), 'No permission to see approve link'); $this->assertNull($comment->ApproveLink(), 'No permission to see approve link');
// Test authenticated user // Test authenticated user
$this->logInAs('commentadmin'); $this->logInAs('commentadmin');
@ -251,7 +251,7 @@ class CommentsTest extends FunctionalTest {
$this->assertEquals(1, $check->Moderated); $this->assertEquals(1, $check->Moderated);
// Cannot re-approve approved comment // Cannot re-approve approved comment
$this->assertFalse($check->ApproveLink()); $this->assertNull($check->ApproveLink());
} }
public function testCommenterURLWrite() { public function testCommenterURLWrite() {