Merge pull request #113 from tractorcow/pulls/2.0/comment-gridfield-actions

BUG Only show correct gridfield options for comments

code/admin/CommentsGridFieldAction.php

@@ -41,6 +41,7 @@ class CommentsGridFieldAction implements GridField_ColumnProvider, GridField_Act
 
 		$field = "";
 
+		if(!$record->IsSpam || !$record->Moderated) {
 			$field .= GridField_FormAction::create(
 				$gridField,
 				'CustomAction' . $record->ID,
@@ -48,7 +49,9 @@ class CommentsGridFieldAction implements GridField_ColumnProvider, GridField_Act
 				'spam',
 				array('RecordID' => $record->ID)
 			)->Field();
+		}
 
+		if($record->IsSpam || !$record->Moderated) {
 			$field .= GridField_FormAction::create(
 				$gridField,
 				'CustomAction' . $record->ID,
@@ -56,6 +59,7 @@ class CommentsGridFieldAction implements GridField_ColumnProvider, GridField_Act
 				'approve',
 				array('RecordID' => $record->ID)
 			)->Field();
+		}
 
 		return $field;
 	}
@@ -73,10 +77,7 @@ class CommentsGridFieldAction implements GridField_ColumnProvider, GridField_Act
 	public function handleAction(GridField $gridField, $actionName, $arguments, $data) {
 		if($actionName == 'spam') {
 			$comment = Comment::get()->byID($arguments["RecordID"]);
-
+			$comment->markSpam();
-			$comment->Moderated = true;
-			$comment->IsSpam = true;
-			$comment->write();
 
 			// output a success message to the user
 			Controller::curr()->getResponse()->setStatusCode(
@@ -87,10 +88,7 @@ class CommentsGridFieldAction implements GridField_ColumnProvider, GridField_Act
 
 		if($actionName == 'approve') {
 			$comment = Comment::get()->byID($arguments["RecordID"]);
-
+			$comment->markApproved();
-			$comment->Moderated = true;
-			$comment->IsSpam = false;
-			$comment->write();
 
 			// output a success message to the user
 			Controller::curr()->getResponse()->setStatusCode(

code/admin/CommentsGridFieldBulkAction.php

@@ -30,10 +30,7 @@ class CommentsGridFieldBulkAction_Handlers extends CommentsGridFieldBulkAction {
 
 		foreach($this->getRecords() as $record) {
 			array_push($ids, $record->ID);
-
+			$record->markSpam();
-			$record->Moderated = 1;
-			$record->IsSpam = 1;
-			$record->write();
 		}
 
 		$response = new SS_HTTPResponse(Convert::raw2json(array(
@@ -52,10 +49,7 @@ class CommentsGridFieldBulkAction_Handlers extends CommentsGridFieldBulkAction {
 
 		foreach($this->getRecords() as $record) {
 			array_push($ids, $record->ID);
-
+			$record->markApproved();
-			$record->Moderated = 1;
-			$record->IsSpam = 0;
-			$record->write();
 		}
 
 		$response = new SS_HTTPResponse(Convert::raw2json(array(

code/admin/CommentsGridFieldConfig.php

@@ -14,8 +14,8 @@ class CommentsGridFieldConfig extends GridFieldConfig_RecordEditor {
 			'ParentTitle' => function($value, &$item) {
 				return sprintf(
 					'<a href="%s" class="cms-panel-link external-link action" target="_blank">%s</a>',
-					Convert::raw2xml($item->Link()),
+					Convert::raw2att($item->Link()),
-					Convert::raw2xml($value)
+					$item->obj('ParentTitle')->forTemplate()
 				);
 			}
 		));

code/controllers/CommentingController.php

@@ -225,9 +225,7 @@ class CommentingController extends Controller {
 		}
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 		
-		$comment->IsSpam = true;
+		$comment->markSpam();
-		$comment->Moderated = true;
-		$comment->write();
 
 		return $this->request->isAjax()
 			? $comment->renderWith('CommentsInterface_singlecomment')
@@ -245,9 +243,7 @@ class CommentingController extends Controller {
 		}
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 
-		$comment->IsSpam = false;
+		$comment->markApproved();
-		$comment->Moderated = true;
-		$comment->write();
 
 		return $this->request->isAjax()
 			? $comment->renderWith('CommentsInterface_singlecomment')
@@ -265,9 +261,7 @@ class CommentingController extends Controller {
 		}
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 
-		$comment->IsSpam = false;
+		$comment->markApproved();
-		$comment->Moderated = true;
-		$comment->write();
 
 		return $this->request->isAjax()
 			? $comment->renderWith('CommentsInterface_singlecomment')

code/dataobjects/Comment.php

@@ -446,6 +446,34 @@ class Comment extends DataObject {
 		}
 	}
 
+	/**
+	 * Mark this comment as spam
+	 */
+	public function markSpam() {
+		$this->IsSpam = true;
+		$this->Moderated = true;
+		$this->write();
+		$this->extend('afterMarkSpam');
+	}
+
+	/**
+	 * Mark this comment as approved
+	 */
+	public function markApproved() {
+		$this->IsSpam = false;
+		$this->Moderated = true;
+		$this->write();
+		$this->extend('afterMarkApproved');
+	}
+
+	/**
+	 * Mark this comment as unapproved
+	 */
+	public function markUnapproved() {
+		$this->Moderated = false;
+		$this->write();
+		$this->extend('afterMarkUnapproved');
+	}
 	/**
 	 * @return string
 	 */