Skip to content
Snippets Groups Projects
Verified Commit 6067ed42 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #221761 by mohit_aghera, pameeela, dixon_, catch, ged3000, sun,...

Issue #221761 by mohit_aghera, pameeela, dixon_, catch, ged3000, sun, deepakaryan1988, smustgrave, stefank, jredding, dawehner, harshit97, xjm, jhedstrom, geertvd, alexpott, Dries: Hide reply link for unpublished comments
parent 0c9e4a4b
No related branches found
No related tags found
No related merge requests found
......@@ -184,7 +184,8 @@ protected function buildLinks(CommentInterface $entity, EntityInterface $comment
];
}
$field_definition = $commented_entity->getFieldDefinition($entity->getFieldName());
if ($entity->access('create')
if ($entity->isPublished()
&& $entity->access('create')
&& $field_definition->getSetting('default_mode') === CommentManagerInterface::COMMENT_MODE_THREADED) {
$links['comment-reply'] = [
'title' => t('Reply'),
......
......@@ -18,6 +18,31 @@ class CommentThreadingTest extends CommentTestBase {
*/
protected $defaultTheme = 'stark';
/**
* Check the reply link on unpublished comments.
*/
public function testCommentReplyLinkUnpublished(): void {
// Set comments to have a subject with preview disabled.
$this->setCommentPreview(DRUPAL_DISABLED);
$this->setCommentForm(FALSE);
$this->setCommentSettings('default_mode', CommentManagerInterface:: COMMENT_MODE_THREADED, 'Comment paging changed.');
// Create a node.
$this->drupalLogin($this->adminUser);
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
// Post comment #1.
$comment_text = $this->randomMachineName();
$comment1 = $this->postComment($this->node, $comment_text, '', TRUE);
$this->drupalGet($this->node->toUrl());
$this->assertSession()->pageTextContains('Reply');
$comment1->setUnpublished();
$comment1->save();
$this->drupalGet($this->node->toUrl());
$this->assertSession()->pageTextNotContains('Reply');
}
/**
* Tests the comment threading.
*/
......@@ -33,7 +58,6 @@ public function testCommentThreading(): void {
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'uid' => $this->webUser->id()]);
// Post comment #1.
$this->drupalLogin($this->webUser);
$subject_text = $this->randomMachineName();
$comment_text = $this->randomMachineName();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment