Drupal 8.0.0 beta 12. More info: https://www.drupal.org/node/2514176
This commit is contained in:
Pantheon Automation
Greg Anderson
commit
9921556621
13277 changed files with 1459781 additions and 0 deletions
|
|
@ -0,0 +1,78 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Breadcrumb\ForumBreadcrumbBuilderBase.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Breadcrumb;
|
||||
|
||||
use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
|
||||
use Drupal\Core\Config\ConfigFactoryInterface;
|
||||
use Drupal\Core\Entity\EntityManagerInterface;
|
||||
use Drupal\Core\Link;
|
||||
use Drupal\Core\Routing\RouteMatchInterface;
|
||||
use Drupal\Core\StringTranslation\StringTranslationTrait;
|
||||
use Drupal\forum\ForumManagerInterface;
|
||||
|
||||
/**
|
||||
* Provides a forum breadcrumb base class.
|
||||
*
|
||||
* This just holds the dependency-injected config, entity manager, and forum
|
||||
* manager objects.
|
||||
*/
|
||||
abstract class ForumBreadcrumbBuilderBase implements BreadcrumbBuilderInterface {
|
||||
use StringTranslationTrait;
|
||||
|
||||
/**
|
||||
* Configuration object for this builder.
|
||||
*
|
||||
* @var \Drupal\Core\Config\Config
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* The entity manager.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityManagerInterface
|
||||
*/
|
||||
protected $entityManager;
|
||||
|
||||
/**
|
||||
* The forum manager service.
|
||||
*
|
||||
* @var \Drupal\forum\ForumManagerInterface
|
||||
*/
|
||||
protected $forumManager;
|
||||
|
||||
/**
|
||||
* Constructs a forum breadcrumb builder object.
|
||||
*
|
||||
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
|
||||
* The entity manager.
|
||||
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
|
||||
* The configuration factory.
|
||||
* @param \Drupal\forum\ForumManagerInterface $forum_manager
|
||||
* The forum manager service.
|
||||
*/
|
||||
public function __construct(EntityManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, ForumManagerInterface $forum_manager) {
|
||||
$this->entityManager = $entity_manager;
|
||||
$this->config = $config_factory->get('forum.settings');
|
||||
$this->forumManager = $forum_manager;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function build(RouteMatchInterface $route_match) {
|
||||
$breadcrumb[] = Link::createFromRoute($this->t('Home'), '<front>');
|
||||
|
||||
$vocabulary = $this->entityManager
|
||||
->getStorage('taxonomy_vocabulary')
|
||||
->load($this->config->get('vocabulary'));
|
||||
$breadcrumb[] = Link::createFromRoute($vocabulary->label(), 'forum.index');
|
||||
|
||||
return $breadcrumb;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Breadcrumb;
|
||||
|
||||
use Drupal\Core\Link;
|
||||
use Drupal\Core\Routing\RouteMatchInterface;
|
||||
|
||||
/**
|
||||
* Provides a breadcrumb builder base class for forum listing pages.
|
||||
*/
|
||||
class ForumListingBreadcrumbBuilder extends ForumBreadcrumbBuilderBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function applies(RouteMatchInterface $route_match) {
|
||||
return $route_match->getRouteName() == 'forum.page' && $route_match->getParameter('taxonomy_term');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function build(RouteMatchInterface $route_match) {
|
||||
$breadcrumb = parent::build($route_match);
|
||||
|
||||
// Add all parent forums to breadcrumbs.
|
||||
$term_id = $route_match->getParameter('taxonomy_term')->id();
|
||||
$parents = $this->forumManager->getParents($term_id);
|
||||
if ($parents) {
|
||||
foreach (array_reverse($parents) as $parent) {
|
||||
if ($parent->id() != $term_id) {
|
||||
$breadcrumb[] = Link::createFromRoute($parent->label(), 'forum.page', array(
|
||||
'taxonomy_term' => $parent->id(),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
return $breadcrumb;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Breadcrumb;
|
||||
|
||||
use Drupal\Core\Link;
|
||||
use Drupal\Core\Routing\RouteMatchInterface;
|
||||
|
||||
/**
|
||||
* Breadcrumb builder for forum nodes.
|
||||
*/
|
||||
class ForumNodeBreadcrumbBuilder extends ForumBreadcrumbBuilderBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function applies(RouteMatchInterface $route_match) {
|
||||
return $route_match->getRouteName() == 'entity.node.canonical'
|
||||
&& $route_match->getParameter('node')
|
||||
&& $this->forumManager->checkNodeType($route_match->getParameter('node'));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function build(RouteMatchInterface $route_match) {
|
||||
$breadcrumb = parent::build($route_match);
|
||||
|
||||
$parents = $this->forumManager->getParents($route_match->getParameter('node')->forum_tid);
|
||||
if ($parents) {
|
||||
$parents = array_reverse($parents);
|
||||
foreach ($parents as $parent) {
|
||||
$breadcrumb[] = Link::createFromRoute($parent->label(), 'forum.page',
|
||||
array(
|
||||
'taxonomy_term' => $parent->id(),
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
return $breadcrumb;
|
||||
}
|
||||
|
||||
}
|
||||
343
core/modules/forum/src/Controller/ForumController.php
Normal file
343
core/modules/forum/src/Controller/ForumController.php
Normal file
|
|
@ -0,0 +1,343 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Controller\ForumController.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Controller;
|
||||
|
||||
use Drupal\Core\Cache\Cache;
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Drupal\Core\Entity\EntityAccessControlHandlerInterface;
|
||||
use Drupal\Core\Entity\EntityStorageInterface;
|
||||
use Drupal\Core\Entity\EntityTypeInterface;
|
||||
use Drupal\Core\Render\RendererInterface;
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\forum\ForumManagerInterface;
|
||||
use Drupal\taxonomy\TermInterface;
|
||||
use Drupal\taxonomy\TermStorageInterface;
|
||||
use Drupal\taxonomy\VocabularyStorageInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Controller routines for forum routes.
|
||||
*/
|
||||
class ForumController extends ControllerBase {
|
||||
|
||||
/**
|
||||
* Forum manager service.
|
||||
*
|
||||
* @var \Drupal\forum\ForumManagerInterface
|
||||
*/
|
||||
protected $forumManager;
|
||||
|
||||
/**
|
||||
* Vocabulary storage.
|
||||
*
|
||||
* @var \Drupal\taxonomy\VocabularyStorageInterface
|
||||
*/
|
||||
protected $vocabularyStorage;
|
||||
|
||||
/**
|
||||
* Term storage.
|
||||
*
|
||||
* @var \Drupal\taxonomy\TermStorageInterface
|
||||
*/
|
||||
protected $termStorage;
|
||||
|
||||
/**
|
||||
* Node access control handler.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityAccessControlHandlerInterface
|
||||
*/
|
||||
protected $nodeAccess;
|
||||
|
||||
/**
|
||||
* Field map of existing fields on the site.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $fieldMap;
|
||||
|
||||
/**
|
||||
* Node type storage handler.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityStorageInterface
|
||||
*/
|
||||
protected $nodeTypeStorage;
|
||||
|
||||
/**
|
||||
* The renderer.
|
||||
*
|
||||
* @var \Drupal\Core\Render\RendererInterface
|
||||
*/
|
||||
protected $renderer;
|
||||
|
||||
/**
|
||||
* Node entity type, we need to get cache tags from here.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityTypeInterface
|
||||
*/
|
||||
protected $nodeEntityTypeDefinition;
|
||||
|
||||
/**
|
||||
* Comment entity type, we need to get cache tags from here.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityTypeInterface
|
||||
*/
|
||||
protected $commentEntityTypeDefinition;
|
||||
|
||||
/**
|
||||
* Constructs a ForumController object.
|
||||
*
|
||||
* @param \Drupal\forum\ForumManagerInterface $forum_manager
|
||||
* The forum manager service.
|
||||
* @param \Drupal\taxonomy\VocabularyStorageInterface $vocabulary_storage
|
||||
* Vocabulary storage.
|
||||
* @param \Drupal\taxonomy\TermStorageInterface $term_storage
|
||||
* Term storage.
|
||||
* @param \Drupal\Core\Session\AccountInterface $current_user
|
||||
* The current logged in user.
|
||||
* @param \Drupal\Core\Entity\EntityAccessControlHandlerInterface $node_access
|
||||
* Node access control handler.
|
||||
* @param array $field_map
|
||||
* Array of active fields on the site.
|
||||
* @param \Drupal\Core\Entity\EntityStorageInterface $node_type_storage
|
||||
* Node type storage handler.
|
||||
* @param \Drupal\Core\Render\RendererInterface $renderer
|
||||
* The renderer.
|
||||
* @param \Drupal\Core\Entity\EntityTypeInterface $node_entity_type_definition
|
||||
* Node entity type definition object
|
||||
* @param \Drupal\Core\Entity\EntityTypeInterface $comment_entity_type_definition
|
||||
* Comment entity type definition object
|
||||
*/
|
||||
public function __construct(ForumManagerInterface $forum_manager, VocabularyStorageInterface $vocabulary_storage, TermStorageInterface $term_storage, AccountInterface $current_user, EntityAccessControlHandlerInterface $node_access, array $field_map, EntityStorageInterface $node_type_storage, RendererInterface $renderer, EntityTypeInterface $node_entity_type_definition, EntityTypeInterface $comment_entity_type_definition) {
|
||||
$this->forumManager = $forum_manager;
|
||||
$this->vocabularyStorage = $vocabulary_storage;
|
||||
$this->termStorage = $term_storage;
|
||||
$this->currentUser = $current_user;
|
||||
$this->nodeAccess = $node_access;
|
||||
$this->fieldMap = $field_map;
|
||||
$this->nodeTypeStorage = $node_type_storage;
|
||||
$this->renderer = $renderer;
|
||||
$this->nodeEntityTypeDefinition = $node_entity_type_definition;
|
||||
$this->commentEntityTypeDefinition = $comment_entity_type_definition;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
/** @var \Drupal\Core\Entity\EntityManagerInterface $entity_manager */
|
||||
$entity_manager = $container->get('entity.manager');
|
||||
|
||||
return new static(
|
||||
$container->get('forum_manager'),
|
||||
$entity_manager->getStorage('taxonomy_vocabulary'),
|
||||
$entity_manager->getStorage('taxonomy_term'),
|
||||
$container->get('current_user'),
|
||||
$entity_manager->getAccessControlHandler('node'),
|
||||
$entity_manager->getFieldMap(),
|
||||
$entity_manager->getStorage('node_type'),
|
||||
$container->get('renderer'),
|
||||
$entity_manager->getDefinition('node'),
|
||||
$entity_manager->getDefinition('comment')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns forum page for a given forum.
|
||||
*
|
||||
* @param \Drupal\taxonomy\TermInterface $taxonomy_term
|
||||
* The forum to render the page for.
|
||||
*
|
||||
* @return array
|
||||
* A render array.
|
||||
*/
|
||||
public function forumPage(TermInterface $taxonomy_term) {
|
||||
// Get forum details.
|
||||
$taxonomy_term->forums = $this->forumManager->getChildren($this->config('forum.settings')->get('vocabulary'), $taxonomy_term->id());
|
||||
$taxonomy_term->parents = $this->forumManager->getParents($taxonomy_term->id());
|
||||
|
||||
if (empty($taxonomy_term->forum_container->value)) {
|
||||
$build = $this->forumManager->getTopics($taxonomy_term->id(), $this->currentUser());
|
||||
$topics = $build['topics'];
|
||||
$header = $build['header'];
|
||||
}
|
||||
else {
|
||||
$topics = [];
|
||||
$header = [];
|
||||
}
|
||||
return $this->build($taxonomy_term->forums, $taxonomy_term, $topics, $taxonomy_term->parents, $header);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns forum index page.
|
||||
*
|
||||
* @return array
|
||||
* A render array.
|
||||
*/
|
||||
public function forumIndex() {
|
||||
$vocabulary = $this->vocabularyStorage->load($this->config('forum.settings')->get('vocabulary'));
|
||||
$index = $this->forumManager->getIndex();
|
||||
$build = $this->build($index->forums, $index);
|
||||
if (empty($index->forums)) {
|
||||
// Root of empty forum.
|
||||
$build['#title'] = $this->t('No forums defined');
|
||||
}
|
||||
else {
|
||||
// Set the page title to forum's vocabulary name.
|
||||
$build['#title'] = $vocabulary->label();
|
||||
}
|
||||
return $build;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a renderable forum index page array.
|
||||
*
|
||||
* @param array $forums
|
||||
* A list of forums.
|
||||
* @param \Drupal\taxonomy\TermInterface $term
|
||||
* The taxonomy term of the forum.
|
||||
* @param array $topics
|
||||
* The topics of this forum.
|
||||
* @param array $parents
|
||||
* The parent forums in relation this forum.
|
||||
* @param array $header
|
||||
* Array of header cells.
|
||||
*
|
||||
* @return array
|
||||
* A render array.
|
||||
*/
|
||||
protected function build($forums, TermInterface $term, $topics = array(), $parents = array(), $header = array()) {
|
||||
$config = $this->config('forum.settings');
|
||||
$build = array(
|
||||
'#theme' => 'forums',
|
||||
'#forums' => $forums,
|
||||
'#topics' => $topics,
|
||||
'#parents' => $parents,
|
||||
'#header' => $header,
|
||||
'#term' => $term,
|
||||
'#sortby' => $config->get('topics.order'),
|
||||
'#forums_per_page' => $config->get('topics.page_limit'),
|
||||
);
|
||||
$build['#attached']['library'][] = 'forum/forum.index';
|
||||
if (empty($term->forum_container->value)) {
|
||||
$build['#attached']['feed'][] = array('taxonomy/term/' . $term->id() . '/feed', 'RSS - ' . $term->getName());
|
||||
}
|
||||
$this->renderer->addCacheableDependency($build, $config);
|
||||
|
||||
foreach ($forums as $forum) {
|
||||
$this->renderer->addCacheableDependency($build, $forum);
|
||||
}
|
||||
foreach ($topics as $topic) {
|
||||
$this->renderer->addCacheableDependency($build, $topic);
|
||||
}
|
||||
foreach ($parents as $parent) {
|
||||
$this->renderer->addCacheableDependency($build, $parent);
|
||||
}
|
||||
$this->renderer->addCacheableDependency($build, $term);
|
||||
|
||||
return [
|
||||
'action' => $this->buildActionLinks($config->get('vocabulary'), $term),
|
||||
'forum' => $build,
|
||||
'#cache' => [
|
||||
'tags' => Cache::mergeTags($this->nodeEntityTypeDefinition->getListCacheTags(), $this->commentEntityTypeDefinition->getListCacheTags()),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns add forum entity form.
|
||||
*
|
||||
* @return array
|
||||
* Render array for the add form.
|
||||
*/
|
||||
public function addForum() {
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$taxonomy_term = $this->termStorage->create(array(
|
||||
'vid' => $vid,
|
||||
'forum_controller' => 0,
|
||||
));
|
||||
return $this->entityFormBuilder()->getForm($taxonomy_term, 'forum');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns add container entity form.
|
||||
*
|
||||
* @return array
|
||||
* Render array for the add form.
|
||||
*/
|
||||
public function addContainer() {
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$taxonomy_term = $this->termStorage->create(array(
|
||||
'vid' => $vid,
|
||||
'forum_container' => 1,
|
||||
));
|
||||
return $this->entityFormBuilder()->getForm($taxonomy_term, 'container');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an action link to display at the top of the forum listing.
|
||||
*
|
||||
* @param string $vid
|
||||
* Vocabulary ID.
|
||||
* @param \Drupal\taxonomy\TermInterface $forum_term
|
||||
* The term for which the links are to be built.
|
||||
*
|
||||
* @return array
|
||||
* Render array containing the links.
|
||||
*/
|
||||
protected function buildActionLinks($vid, TermInterface $forum_term = NULL) {
|
||||
$user = $this->currentUser();
|
||||
|
||||
$links = [];
|
||||
// Loop through all bundles for forum taxonomy vocabulary field.
|
||||
foreach ($this->fieldMap['node']['taxonomy_forums']['bundles'] as $type) {
|
||||
if ($this->nodeAccess->createAccess($type)) {
|
||||
$node_type = $this->nodeTypeStorage->load($type);
|
||||
$links[$type] = [
|
||||
'#attributes' => ['class' => ['action-links']],
|
||||
'#theme' => 'menu_local_action',
|
||||
'#link' => [
|
||||
'title' => $this->t('Add new @node_type', [
|
||||
'@node_type' => $this->nodeTypeStorage->load($type)->label(),
|
||||
]),
|
||||
'url' => Url::fromRoute('node.add', ['node_type' => $type]),
|
||||
],
|
||||
'#cache' => [
|
||||
'tags' => $node_type->getCacheTags(),
|
||||
],
|
||||
];
|
||||
if ($forum_term && $forum_term->bundle() == $vid) {
|
||||
// We are viewing a forum term (specific forum), append the tid to
|
||||
// the url.
|
||||
$links[$type]['#link']['localized_options']['query']['forum_id'] = $forum_term->id();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (empty($links)) {
|
||||
// Authenticated user does not have access to create new topics.
|
||||
if ($user->isAuthenticated()) {
|
||||
$links['disallowed'] = [
|
||||
'#markup' => $this->t('You are not allowed to post new content in the forum.'),
|
||||
];
|
||||
}
|
||||
// Anonymous user does not have access to create new topics.
|
||||
else {
|
||||
$links['login'] = [
|
||||
'#attributes' => ['class' => ['action-links']],
|
||||
'#theme' => 'menu_local_action',
|
||||
'#link' => array(
|
||||
'title' => $this->t('Log in to post new content in the forum.'),
|
||||
'url' => Url::fromRoute('user.login', [], ['query' => $this->getDestinationArray()]),
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
return $links;
|
||||
}
|
||||
|
||||
}
|
||||
51
core/modules/forum/src/Form/ContainerForm.php
Normal file
51
core/modules/forum/src/Form/ContainerForm.php
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Form\ContainerForm.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Form;
|
||||
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
|
||||
/**
|
||||
* Base form for container term edit forms.
|
||||
*/
|
||||
class ContainerForm extends ForumForm {
|
||||
|
||||
/**
|
||||
* Reusable url stub to use in watchdog messages.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $urlStub = 'container';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function form(array $form, FormStateInterface $form_state) {
|
||||
$taxonomy_term = $this->entity;
|
||||
// Build the bulk of the form from the parent forum form.
|
||||
$form = parent::form($form, $form_state, $taxonomy_term);
|
||||
|
||||
// Set the title and description of the name field.
|
||||
$form['name']['#title'] = $this->t('Container name');
|
||||
$form['name']['#description'] = $this->t('Short but meaningful name for this collection of related forums.');
|
||||
|
||||
// Alternate description for the container parent.
|
||||
$form['parent'][0]['#description'] = $this->t('Containers are usually placed at the top (root) level, but may also be placed inside another container or forum.');
|
||||
$this->forumFormType = $this->t('forum container');
|
||||
return $form;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildEntity(array $form, FormStateInterface $form_state) {
|
||||
$entity = parent::buildEntity($form, $form_state);
|
||||
$entity->forum_container = TRUE;
|
||||
return $entity;
|
||||
}
|
||||
|
||||
}
|
||||
74
core/modules/forum/src/Form/DeleteForm.php
Normal file
74
core/modules/forum/src/Form/DeleteForm.php
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Form\DeleteForm.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Form;
|
||||
|
||||
use Drupal\Core\Form\ConfirmFormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\taxonomy\TermInterface;
|
||||
|
||||
/**
|
||||
* Builds the form to delete a forum term.
|
||||
*/
|
||||
class DeleteForm extends ConfirmFormBase {
|
||||
|
||||
/**
|
||||
* The taxonomy term being deleted.
|
||||
*
|
||||
* @var \Drupal\taxonomy\TermInterface
|
||||
*/
|
||||
protected $taxonomyTerm;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'forum_confirm_delete';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getQuestion() {
|
||||
return $this->t('Are you sure you want to delete the forum %label?', array('%label' => $this->taxonomyTerm->label()));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getCancelUrl() {
|
||||
return new Url('forum.overview');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getConfirmText() {
|
||||
return $this->t('Delete');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state, TermInterface $taxonomy_term = NULL) {
|
||||
$this->taxonomyTerm = $taxonomy_term;
|
||||
|
||||
return parent::buildForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$this->taxonomyTerm->delete();
|
||||
drupal_set_message($this->t('The forum %label and all sub-forums have been deleted.', array('%label' => $this->taxonomyTerm->label())));
|
||||
$this->logger('forum')->notice('forum: deleted %label and all its sub-forums.', array('%label' => $this->taxonomyTerm->label()));
|
||||
$form_state->setRedirectUrl($this->getCancelUrl());
|
||||
}
|
||||
|
||||
}
|
||||
172
core/modules/forum/src/Form/ForumForm.php
Normal file
172
core/modules/forum/src/Form/ForumForm.php
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Form\ForumForm.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Form;
|
||||
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\taxonomy\TermForm;
|
||||
|
||||
/**
|
||||
* Base form for forum term edit forms.
|
||||
*/
|
||||
class ForumForm extends TermForm {
|
||||
|
||||
/**
|
||||
* Reusable type field to use in status messages.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $forumFormType;
|
||||
|
||||
/**
|
||||
* Reusable url stub to use in watchdog messages.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $urlStub = 'forum';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function form(array $form, FormStateInterface $form_state) {
|
||||
$taxonomy_term = $this->entity;
|
||||
// Build the bulk of the form from the parent taxonomy term form.
|
||||
$form = parent::form($form, $form_state, $taxonomy_term);
|
||||
|
||||
// Set the title and description of the name field.
|
||||
$form['name']['#title'] = $this->t('Forum name');
|
||||
$form['name']['#description'] = $this->t('Short but meaningful name for this collection of threaded discussions.');
|
||||
|
||||
// Change the description.
|
||||
$form['description']['#description'] = $this->t('Description and guidelines for discussions within this forum.');
|
||||
|
||||
// Re-use the weight field.
|
||||
$form['weight'] = $form['relations']['weight'];
|
||||
|
||||
// Remove the remaining relations fields.
|
||||
unset($form['relations']);
|
||||
|
||||
// Our parent field is different to the taxonomy term.
|
||||
$form['parent']['#tree'] = TRUE;
|
||||
$form['parent'][0] = $this->forumParentSelect($taxonomy_term->id(), $this->t('Parent'));
|
||||
|
||||
$form['#theme_wrappers'] = array('form__forum');
|
||||
$this->forumFormType = $this->t('forum');
|
||||
return $form;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildEntity(array $form, FormStateInterface $form_state) {
|
||||
$term = parent::buildEntity($form, $form_state);
|
||||
|
||||
// Assign parents from forum parent select field.
|
||||
$term->parent = array($form_state->getValue(array('parent', 0)));
|
||||
|
||||
return $term;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function save(array $form, FormStateInterface $form_state) {
|
||||
$term = $this->entity;
|
||||
$term_storage = $this->entityManager->getStorage('taxonomy_term');
|
||||
$status = $term_storage->save($term);
|
||||
|
||||
$route_name = $this->urlStub == 'container' ? 'entity.taxonomy_term.forum_edit_container_form' : 'entity.taxonomy_term.forum_edit_form';
|
||||
$route_parameters = ['taxonomy_term' => $term->id()];
|
||||
$link = $this->l($this->t('Edit'), new Url($route_name, $route_parameters));
|
||||
switch ($status) {
|
||||
case SAVED_NEW:
|
||||
drupal_set_message($this->t('Created new @type %term.', array('%term' => $term->getName(), '@type' => $this->forumFormType)));
|
||||
$this->logger('forum')->notice('Created new @type %term.', array('%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link));
|
||||
$form_state->setValue('tid', $term->id());
|
||||
break;
|
||||
|
||||
case SAVED_UPDATED:
|
||||
drupal_set_message($this->t('The @type %term has been updated.', array('%term' => $term->getName(), '@type' => $this->forumFormType)));
|
||||
$this->logger('forum')->notice('Updated @type %term.', array('%term' => $term->getName(), '@type' => $this->forumFormType, 'link' => $link));
|
||||
break;
|
||||
}
|
||||
|
||||
$form_state->setRedirect('forum.overview');
|
||||
return $term;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function actions(array $form, FormStateInterface $form_state) {
|
||||
$actions = parent::actions($form, $form_state);
|
||||
|
||||
if (!$this->entity->isNew() && $this->entity->hasLinkTemplate('forum-delete-form')) {
|
||||
$actions['delete']['#url'] = $this->entity->urlInfo('forum-delete-form');
|
||||
}
|
||||
else {
|
||||
unset($actions['delete']);
|
||||
}
|
||||
|
||||
return $actions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a select box for available parent terms.
|
||||
*
|
||||
* @param int $tid
|
||||
* ID of the term that is being added or edited.
|
||||
* @param string $title
|
||||
* Title for the select box.
|
||||
*
|
||||
* @return array
|
||||
* A select form element.
|
||||
*/
|
||||
protected function forumParentSelect($tid, $title) {
|
||||
$taxonomy_storage = $this->entityManager->getStorage('taxonomy_term');
|
||||
$parents = $taxonomy_storage->loadParents($tid);
|
||||
if ($parents) {
|
||||
$parent = array_shift($parents);
|
||||
$parent = $parent->id();
|
||||
}
|
||||
else {
|
||||
$parent = 0;
|
||||
}
|
||||
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$children = $taxonomy_storage->loadTree($vid, $tid, NULL, TRUE);
|
||||
|
||||
// A term can't be the child of itself, nor of its children.
|
||||
foreach ($children as $child) {
|
||||
$exclude[] = $child->tid;
|
||||
}
|
||||
$exclude[] = $tid;
|
||||
|
||||
$tree = $taxonomy_storage->loadTree($vid, 0, NULL, TRUE);
|
||||
$options[0] = '<' . $this->t('root') . '>';
|
||||
if ($tree) {
|
||||
foreach ($tree as $term) {
|
||||
if (!in_array($term->id(), $exclude)) {
|
||||
$options[$term->id()] = str_repeat(' -- ', $term->depth) . $term->getName();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$description = $this->t('Forums may be placed at the top (root) level, or inside another container or forum.');
|
||||
|
||||
return array(
|
||||
'#type' => 'select',
|
||||
'#title' => $title,
|
||||
'#default_value' => $parent,
|
||||
'#options' => $options,
|
||||
'#description' => $description,
|
||||
'#required' => TRUE,
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
99
core/modules/forum/src/Form/Overview.php
Normal file
99
core/modules/forum/src/Form/Overview.php
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Form\Overview.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Form;
|
||||
|
||||
use Drupal\Core\Entity\EntityManagerInterface;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Render\Element;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\taxonomy\Form\OverviewTerms;
|
||||
use Drupal\Core\Config\ConfigFactoryInterface;
|
||||
use Drupal\Core\Extension\ModuleHandlerInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
/*
|
||||
* Provides forum overview form for the forum vocabulary.
|
||||
*/
|
||||
class Overview extends OverviewTerms {
|
||||
|
||||
/**
|
||||
* Entity manager Service Object.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityManagerInterface
|
||||
*/
|
||||
protected $entityManager;
|
||||
|
||||
/**
|
||||
* Constructs a \Drupal\forum\Form\OverviewForm object.
|
||||
*
|
||||
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
|
||||
* The module handler service.
|
||||
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
|
||||
* The entity manager service.
|
||||
*/
|
||||
public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager) {
|
||||
parent::__construct($module_handler, $entity_manager);
|
||||
$this->entityManager = $entity_manager;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'forum_overview';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state) {
|
||||
$forum_config = $this->config('forum.settings');
|
||||
$vid = $forum_config->get('vocabulary');
|
||||
$vocabulary = $this->entityManager->getStorage('taxonomy_vocabulary')->load($vid);
|
||||
if (!$vocabulary) {
|
||||
throw new NotFoundHttpException();
|
||||
}
|
||||
|
||||
// Build base taxonomy term overview.
|
||||
$form = parent::buildForm($form, $form_state, $vocabulary);
|
||||
|
||||
foreach (Element::children($form['terms']) as $key) {
|
||||
if (isset($form['terms'][$key]['#term'])) {
|
||||
$term = $form['terms'][$key]['#term'];
|
||||
$form['terms'][$key]['term']['#url'] = Url::fromRoute('forum.page', ['taxonomy_term' => $term->id()]);
|
||||
unset($form['terms'][$key]['operations']['#links']['delete']);
|
||||
$route_parameters = $form['terms'][$key]['operations']['#links']['edit']['url']->getRouteParameters();
|
||||
if (!empty($term->forum_container->value)) {
|
||||
$form['terms'][$key]['operations']['#links']['edit']['title'] = $this->t('edit container');
|
||||
$form['terms'][$key]['operations']['#links']['edit']['url'] = Url::fromRoute('entity.taxonomy_term.forum_edit_container_form', $route_parameters);
|
||||
}
|
||||
else {
|
||||
$form['terms'][$key]['operations']['#links']['edit']['title'] = $this->t('edit forum');
|
||||
$form['terms'][$key]['operations']['#links']['edit']['url'] = Url::fromRoute('entity.taxonomy_term.forum_edit_form', $route_parameters);
|
||||
}
|
||||
// We don't want the redirect from the link so we can redirect the
|
||||
// delete action.
|
||||
unset($form['terms'][$key]['operations']['#links']['edit']['query']['destination']);
|
||||
}
|
||||
}
|
||||
|
||||
// Remove the alphabetical reset.
|
||||
unset($form['actions']['reset_alphabetical']);
|
||||
|
||||
// The form needs to have submit and validate handlers set explicitly.
|
||||
// Use the existing taxonomy overview submit handler.
|
||||
$form['#submit'] = array('::submitForm');
|
||||
$form['terms']['#empty'] = $this->t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array(
|
||||
'@container' => $this->url('forum.add_container'),
|
||||
'@forum' => $this->url('forum.add_forum')
|
||||
));
|
||||
return $form;
|
||||
}
|
||||
|
||||
}
|
||||
168
core/modules/forum/src/ForumIndexStorage.php
Normal file
168
core/modules/forum/src/ForumIndexStorage.php
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumIndexStorage.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum;
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\Core\Database\Connection;
|
||||
use Drupal\node\NodeInterface;
|
||||
|
||||
/**
|
||||
* Handles CRUD operations to {forum_index} table.
|
||||
*/
|
||||
class ForumIndexStorage implements ForumIndexStorageInterface {
|
||||
|
||||
/**
|
||||
* The active database connection.
|
||||
*
|
||||
* @var \Drupal\Core\Database\Connection
|
||||
*/
|
||||
protected $database;
|
||||
|
||||
/**
|
||||
* Constructs a ForumIndexStorage object.
|
||||
*
|
||||
* @param \Drupal\Core\Database\Connection $database
|
||||
* The current database connection.
|
||||
*/
|
||||
function __construct(Connection $database) {
|
||||
$this->database = $database;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getOriginalTermId(NodeInterface $node) {
|
||||
return $this->database->queryRange("SELECT f.tid FROM {forum} f INNER JOIN {node} n ON f.vid = n.vid WHERE n.nid = :nid ORDER BY f.vid DESC", 0, 1, array(':nid' => $node->id()))->fetchField();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function create(NodeInterface $node) {
|
||||
$this->database->insert('forum')
|
||||
->fields(array(
|
||||
'tid' => $node->forum_tid,
|
||||
'vid' => $node->getRevisionId(),
|
||||
'nid' => $node->id(),
|
||||
))
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function read(array $vids) {
|
||||
return $this->database->select('forum', 'f')
|
||||
->fields('f', array('nid', 'tid'))
|
||||
->condition('f.vid', $vids, 'IN')
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function delete(NodeInterface $node) {
|
||||
$this->database->delete('forum')
|
||||
->condition('nid', $node->id())
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function deleteRevision(NodeInterface $node) {
|
||||
$this->database->delete('forum')
|
||||
->condition('nid', $node->id())
|
||||
->condition('vid', $node->getRevisionId())
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function update(NodeInterface $node) {
|
||||
$this->database->update('forum')
|
||||
->fields(array('tid' => $node->forum_tid))
|
||||
->condition('vid', $node->getRevisionId())
|
||||
->execute();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function updateIndex(NodeInterface $node) {
|
||||
$nid = $node->id();
|
||||
$count = $this->database->query("SELECT COUNT(cid) FROM {comment_field_data} c INNER JOIN {forum_index} i ON c.entity_id = i.nid WHERE c.entity_id = :nid AND c.field_name = 'comment_forum' AND c.entity_type = 'node' AND c.status = :status AND c.default_langcode = 1", array(
|
||||
':nid' => $nid,
|
||||
':status' => CommentInterface::PUBLISHED,
|
||||
))->fetchField();
|
||||
|
||||
if ($count > 0) {
|
||||
// Comments exist.
|
||||
$last_reply = $this->database->queryRange("SELECT cid, name, created, uid FROM {comment_field_data} WHERE entity_id = :nid AND field_name = 'comment_forum' AND entity_type = 'node' AND status = :status AND default_langcode = 1 ORDER BY cid DESC", 0, 1, array(
|
||||
':nid' => $nid,
|
||||
':status' => CommentInterface::PUBLISHED,
|
||||
))->fetchObject();
|
||||
$this->database->update('forum_index')
|
||||
->fields( array(
|
||||
'comment_count' => $count,
|
||||
'last_comment_timestamp' => $last_reply->created,
|
||||
))
|
||||
->condition('nid', $nid)
|
||||
->execute();
|
||||
}
|
||||
else {
|
||||
// Comments do not exist.
|
||||
// @todo This should be actually filtering on the desired node language
|
||||
$this->database->update('forum_index')
|
||||
->fields( array(
|
||||
'comment_count' => 0,
|
||||
'last_comment_timestamp' => $node->getCreatedTime(),
|
||||
))
|
||||
->condition('nid', $nid)
|
||||
->execute();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function createIndex(NodeInterface $node) {
|
||||
$query = $this->database->insert('forum_index')
|
||||
->fields(array('nid', 'title', 'tid', 'sticky', 'created', 'comment_count', 'last_comment_timestamp'));
|
||||
foreach ($node->getTranslationLanguages() as $langcode => $language) {
|
||||
$translation = $node->getTranslation($langcode);
|
||||
foreach ($translation->taxonomy_forums as $item) {
|
||||
$query->values(array(
|
||||
'nid' => $node->id(),
|
||||
'title' => $translation->label(),
|
||||
'tid' => $item->target_id,
|
||||
'sticky' => (int) $node->isSticky(),
|
||||
'created' => $node->getCreatedTime(),
|
||||
'comment_count' => 0,
|
||||
'last_comment_timestamp' => $node->getCreatedTime(),
|
||||
));
|
||||
}
|
||||
}
|
||||
$query->execute();
|
||||
// The logic for determining last_comment_count is fairly complex, so
|
||||
// update the index too.
|
||||
if ($node->isNew()) {
|
||||
$this->updateIndex($node);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function deleteIndex(NodeInterface $node) {
|
||||
$this->database->delete('forum_index')
|
||||
->condition('nid', $node->id())
|
||||
->execute();
|
||||
}
|
||||
|
||||
}
|
||||
94
core/modules/forum/src/ForumIndexStorageInterface.php
Normal file
94
core/modules/forum/src/ForumIndexStorageInterface.php
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
<?php
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumIndexStorageInterface.
|
||||
*/
|
||||
namespace Drupal\forum;
|
||||
|
||||
use Drupal\node\NodeInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Handles CRUD operations to {forum_index} table.
|
||||
*/
|
||||
interface ForumIndexStorageInterface {
|
||||
|
||||
/**
|
||||
* Returns the forum term id associated with an existing forum node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The existing forum node.
|
||||
*
|
||||
* @return int
|
||||
* The forum term id currently associated with the node.
|
||||
*/
|
||||
public function getOriginalTermId(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Creates a record in {forum} table for the given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the record is to be created.
|
||||
*/
|
||||
public function create(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Reads an array of {forum} records for the given revision ids.
|
||||
*
|
||||
* @param array $vids
|
||||
* An array of node revision ids.
|
||||
*
|
||||
* @return \Drupal\Core\Database\StatementInterface
|
||||
* The records from {forum} for the given vids.
|
||||
*/
|
||||
public function read(array $vids);
|
||||
|
||||
/**
|
||||
* Updates the {forum} table for the given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the record is to be updated.
|
||||
*/
|
||||
public function update(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Deletes the records in {forum} table for the given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the records are to be deleted.
|
||||
*/
|
||||
public function delete(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Deletes the records in {forum} table for a given node revision.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node revision for which the records are to be deleted.
|
||||
*/
|
||||
public function deleteRevision(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Creates a {forum_index} entry for the given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the index records are to be created.
|
||||
*/
|
||||
public function createIndex(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Updates the {forum_index} records for a given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the index records are to be updated.
|
||||
*/
|
||||
public function updateIndex(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Deletes the {forum_index} records for a given node.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* The node for which the index records are to be deleted.
|
||||
*/
|
||||
public function deleteIndex(NodeInterface $node);
|
||||
|
||||
}
|
||||
521
core/modules/forum/src/ForumManager.php
Normal file
521
core/modules/forum/src/ForumManager.php
Normal file
|
|
@ -0,0 +1,521 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumManager.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum;
|
||||
|
||||
use Drupal\Core\Config\ConfigFactoryInterface;
|
||||
use Drupal\Core\Database\Connection;
|
||||
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
|
||||
use Drupal\Core\Entity\EntityManagerInterface;
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
use Drupal\Core\StringTranslation\TranslationInterface;
|
||||
use Drupal\Core\StringTranslation\StringTranslationTrait;
|
||||
use Drupal\comment\CommentManagerInterface;
|
||||
use Drupal\node\NodeInterface;
|
||||
|
||||
/**
|
||||
* Provides forum manager service.
|
||||
*/
|
||||
class ForumManager implements ForumManagerInterface {
|
||||
use StringTranslationTrait;
|
||||
use DependencySerializationTrait {
|
||||
__wakeup as defaultWakeup;
|
||||
__sleep as defaultSleep;
|
||||
}
|
||||
|
||||
/**
|
||||
* Forum sort order, newest first.
|
||||
*/
|
||||
const NEWEST_FIRST = 1;
|
||||
|
||||
/**
|
||||
* Forum sort order, oldest first.
|
||||
*/
|
||||
const OLDEST_FIRST = 2;
|
||||
|
||||
/**
|
||||
* Forum sort order, posts with most comments first.
|
||||
*/
|
||||
const MOST_POPULAR_FIRST = 3;
|
||||
|
||||
/**
|
||||
* Forum sort order, posts with the least comments first.
|
||||
*/
|
||||
const LEAST_POPULAR_FIRST = 4;
|
||||
|
||||
/**
|
||||
* Forum settings config object.
|
||||
*
|
||||
* @var \Drupal\Core\Config\ConfigFactoryInterface
|
||||
*/
|
||||
protected $configFactory;
|
||||
|
||||
/**
|
||||
* Entity manager service
|
||||
*
|
||||
* @var \Drupal\Core\Entity\EntityManagerInterface
|
||||
*/
|
||||
protected $entityManager;
|
||||
|
||||
/**
|
||||
* Database connection
|
||||
*
|
||||
* @var \Drupal\Core\Database\Connection
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* The comment manager service.
|
||||
*
|
||||
* @var \Drupal\comment\CommentManagerInterface
|
||||
*/
|
||||
protected $commentManager;
|
||||
|
||||
/**
|
||||
* Array of last post information keyed by forum (term) id.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $lastPostData = array();
|
||||
|
||||
/**
|
||||
* Array of forum statistics keyed by forum (term) id.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $forumStatistics = array();
|
||||
|
||||
/**
|
||||
* Array of forum children keyed by parent forum (term) id.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $forumChildren = array();
|
||||
|
||||
/**
|
||||
* Array of history keyed by nid.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $history = array();
|
||||
|
||||
/**
|
||||
* Cached forum index.
|
||||
*
|
||||
* @var \Drupal\taxonomy\TermInterface
|
||||
*/
|
||||
protected $index;
|
||||
|
||||
/**
|
||||
* Constructs the forum manager service.
|
||||
*
|
||||
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
|
||||
* The config factory service.
|
||||
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
|
||||
* The entity manager service.
|
||||
* @param \Drupal\Core\Database\Connection $connection
|
||||
* The current database connection.
|
||||
* @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
|
||||
* The translation manager service.
|
||||
* @param \Drupal\comment\CommentManagerInterface $comment_manager
|
||||
* The comment manager service.
|
||||
*/
|
||||
public function __construct(ConfigFactoryInterface $config_factory, EntityManagerInterface $entity_manager, Connection $connection, TranslationInterface $string_translation, CommentManagerInterface $comment_manager) {
|
||||
$this->configFactory = $config_factory;
|
||||
$this->entityManager = $entity_manager;
|
||||
$this->connection = $connection;
|
||||
$this->stringTranslation = $string_translation;
|
||||
$this->commentManager = $comment_manager;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getTopics($tid, AccountInterface $account) {
|
||||
$config = $this->configFactory->get('forum.settings');
|
||||
$forum_per_page = $config->get('topics.page_limit');
|
||||
$sortby = $config->get('topics.order');
|
||||
|
||||
$header = array(
|
||||
array('data' => $this->t('Topic'), 'field' => 'f.title'),
|
||||
array('data' => $this->t('Replies'), 'field' => 'f.comment_count'),
|
||||
array('data' => $this->t('Last reply'), 'field' => 'f.last_comment_timestamp'),
|
||||
);
|
||||
|
||||
$order = $this->getTopicOrder($sortby);
|
||||
for ($i = 0; $i < count($header); $i++) {
|
||||
if ($header[$i]['field'] == $order['field']) {
|
||||
$header[$i]['sort'] = $order['sort'];
|
||||
}
|
||||
}
|
||||
|
||||
$query = $this->connection->select('forum_index', 'f')
|
||||
->extend('Drupal\Core\Database\Query\PagerSelectExtender')
|
||||
->extend('Drupal\Core\Database\Query\TableSortExtender');
|
||||
$query->fields('f');
|
||||
$query
|
||||
->condition('f.tid', $tid)
|
||||
->addTag('node_access')
|
||||
->addMetaData('base_table', 'forum_index')
|
||||
->orderBy('f.sticky', 'DESC')
|
||||
->orderByHeader($header)
|
||||
->limit($forum_per_page);
|
||||
|
||||
$count_query = $this->connection->select('forum_index', 'f');
|
||||
$count_query->condition('f.tid', $tid);
|
||||
$count_query->addExpression('COUNT(*)');
|
||||
$count_query->addTag('node_access');
|
||||
$count_query->addMetaData('base_table', 'forum_index');
|
||||
|
||||
$query->setCountQuery($count_query);
|
||||
$result = $query->execute();
|
||||
$nids = array();
|
||||
foreach ($result as $record) {
|
||||
$nids[] = $record->nid;
|
||||
}
|
||||
if ($nids) {
|
||||
$nodes = $this->entityManager->getStorage('node')->loadMultiple($nids);
|
||||
|
||||
$query = $this->connection->select('node_field_data', 'n')
|
||||
->extend('Drupal\Core\Database\Query\TableSortExtender');
|
||||
$query->fields('n', array('nid'));
|
||||
|
||||
$query->join('comment_entity_statistics', 'ces', "n.nid = ces.entity_id AND ces.field_name = 'comment_forum' AND ces.entity_type = 'node'");
|
||||
$query->fields('ces', array(
|
||||
'cid',
|
||||
'last_comment_uid',
|
||||
'last_comment_timestamp',
|
||||
'comment_count'
|
||||
));
|
||||
|
||||
$query->join('forum_index', 'f', 'f.nid = n.nid');
|
||||
$query->addField('f', 'tid', 'forum_tid');
|
||||
|
||||
$query->join('users_field_data', 'u', 'n.uid = u.uid AND u.default_langcode = 1');
|
||||
$query->addField('u', 'name');
|
||||
|
||||
$query->join('users_field_data', 'u2', 'ces.last_comment_uid = u2.uid AND u.default_langcode = 1');
|
||||
|
||||
$query->addExpression('CASE ces.last_comment_uid WHEN 0 THEN ces.last_comment_name ELSE u2.name END', 'last_comment_name');
|
||||
|
||||
$query
|
||||
->orderBy('f.sticky', 'DESC')
|
||||
->orderByHeader($header)
|
||||
->condition('n.nid', $nids, 'IN')
|
||||
// @todo This should be actually filtering on the desired node language
|
||||
// and just fall back to the default language.
|
||||
->condition('n.default_langcode', 1);
|
||||
|
||||
$result = array();
|
||||
foreach ($query->execute() as $row) {
|
||||
$topic = $nodes[$row->nid];
|
||||
$topic->comment_mode = $topic->comment_forum->status;
|
||||
|
||||
foreach ($row as $key => $value) {
|
||||
$topic->{$key} = $value;
|
||||
}
|
||||
$result[] = $topic;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$result = array();
|
||||
}
|
||||
|
||||
$topics = array();
|
||||
$first_new_found = FALSE;
|
||||
foreach ($result as $topic) {
|
||||
if ($account->isAuthenticated()) {
|
||||
// A forum is new if the topic is new, or if there are new comments since
|
||||
// the user's last visit.
|
||||
if ($topic->forum_tid != $tid) {
|
||||
$topic->new = 0;
|
||||
}
|
||||
else {
|
||||
$history = $this->lastVisit($topic->id(), $account);
|
||||
$topic->new_replies = $this->commentManager->getCountNewComments($topic, 'comment_forum', $history);
|
||||
$topic->new = $topic->new_replies || ($topic->last_comment_timestamp > $history);
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Do not track "new replies" status for topics if the user is anonymous.
|
||||
$topic->new_replies = 0;
|
||||
$topic->new = 0;
|
||||
}
|
||||
|
||||
// Make sure only one topic is indicated as the first new topic.
|
||||
$topic->first_new = FALSE;
|
||||
if ($topic->new != 0 && !$first_new_found) {
|
||||
$topic->first_new = TRUE;
|
||||
$first_new_found = TRUE;
|
||||
}
|
||||
|
||||
if ($topic->comment_count > 0) {
|
||||
$last_reply = new \stdClass();
|
||||
$last_reply->created = $topic->last_comment_timestamp;
|
||||
$last_reply->name = $topic->last_comment_name;
|
||||
$last_reply->uid = $topic->last_comment_uid;
|
||||
$topic->last_reply = $last_reply;
|
||||
}
|
||||
$topics[$topic->id()] = $topic;
|
||||
}
|
||||
|
||||
return array('topics' => $topics, 'header' => $header);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets topic sorting information based on an integer code.
|
||||
*
|
||||
* @param int $sortby
|
||||
* One of the following integers indicating the sort criteria:
|
||||
* - ForumManager::NEWEST_FIRST: Date - newest first.
|
||||
* - ForumManager::OLDEST_FIRST: Date - oldest first.
|
||||
* - ForumManager::MOST_POPULAR_FIRST: Posts with the most comments first.
|
||||
* - ForumManager::LEAST_POPULAR_FIRST: Posts with the least comments first.
|
||||
*
|
||||
* @return array
|
||||
* An array with the following values:
|
||||
* - field: A field for an SQL query.
|
||||
* - sort: 'asc' or 'desc'.
|
||||
*/
|
||||
protected function getTopicOrder($sortby) {
|
||||
switch ($sortby) {
|
||||
case static::NEWEST_FIRST:
|
||||
return array('field' => 'f.last_comment_timestamp', 'sort' => 'desc');
|
||||
|
||||
case static::OLDEST_FIRST:
|
||||
return array('field' => 'f.last_comment_timestamp', 'sort' => 'asc');
|
||||
|
||||
case static::MOST_POPULAR_FIRST:
|
||||
return array('field' => 'f.comment_count', 'sort' => 'desc');
|
||||
|
||||
case static::LEAST_POPULAR_FIRST:
|
||||
return array('field' => 'f.comment_count', 'sort' => 'asc');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the last time the user viewed a node.
|
||||
*
|
||||
* @param int $nid
|
||||
* The node ID.
|
||||
* @param \Drupal\Core\Session\AccountInterface $account
|
||||
* Account to fetch last time for.
|
||||
*
|
||||
* @return int
|
||||
* The timestamp when the user last viewed this node, if the user has
|
||||
* previously viewed the node; otherwise HISTORY_READ_LIMIT.
|
||||
*/
|
||||
protected function lastVisit($nid, AccountInterface $account) {
|
||||
if (empty($this->history[$nid])) {
|
||||
$result = $this->connection->select('history', 'h')
|
||||
->fields('h', array('nid', 'timestamp'))
|
||||
->condition('uid', $account->id())
|
||||
->execute();
|
||||
foreach ($result as $t) {
|
||||
$this->history[$t->nid] = $t->timestamp > HISTORY_READ_LIMIT ? $t->timestamp : HISTORY_READ_LIMIT;
|
||||
}
|
||||
}
|
||||
return isset($this->history[$nid]) ? $this->history[$nid] : HISTORY_READ_LIMIT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides the last post information for the given forum tid.
|
||||
*
|
||||
* @param int $tid
|
||||
* The forum tid.
|
||||
*
|
||||
* @return \stdClass
|
||||
* The last post for the given forum.
|
||||
*/
|
||||
protected function getLastPost($tid) {
|
||||
if (!empty($this->lastPostData[$tid])) {
|
||||
return $this->lastPostData[$tid];
|
||||
}
|
||||
// Query "Last Post" information for this forum.
|
||||
$query = $this->connection->select('node_field_data', 'n');
|
||||
$query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $tid));
|
||||
$query->join('comment_entity_statistics', 'ces', "n.nid = ces.entity_id AND ces.field_name = 'comment_forum' AND ces.entity_type = 'node'");
|
||||
$query->join('users_field_data', 'u', 'ces.last_comment_uid = u.uid AND u.default_langcode = 1');
|
||||
$query->addExpression('CASE ces.last_comment_uid WHEN 0 THEN ces.last_comment_name ELSE u.name END', 'last_comment_name');
|
||||
|
||||
$topic = $query
|
||||
->fields('ces', array('last_comment_timestamp', 'last_comment_uid'))
|
||||
->condition('n.status', 1)
|
||||
->orderBy('last_comment_timestamp', 'DESC')
|
||||
->range(0, 1)
|
||||
->addTag('node_access')
|
||||
->execute()
|
||||
->fetchObject();
|
||||
|
||||
// Build the last post information.
|
||||
$last_post = new \stdClass();
|
||||
if (!empty($topic->last_comment_timestamp)) {
|
||||
$last_post->created = $topic->last_comment_timestamp;
|
||||
$last_post->name = $topic->last_comment_name;
|
||||
$last_post->uid = $topic->last_comment_uid;
|
||||
}
|
||||
|
||||
$this->lastPostData[$tid] = $last_post;
|
||||
return $last_post;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides statistics for a forum.
|
||||
*
|
||||
* @param int $tid
|
||||
* The forum tid.
|
||||
*
|
||||
* @return \stdClass|null
|
||||
* Statistics for the given forum if statistics exist, else NULL.
|
||||
*/
|
||||
protected function getForumStatistics($tid) {
|
||||
if (empty($this->forumStatistics)) {
|
||||
// Prime the statistics.
|
||||
$query = $this->connection->select('node_field_data', 'n');
|
||||
$query->join('comment_entity_statistics', 'ces', "n.nid = ces.entity_id AND ces.field_name = 'comment_forum' AND ces.entity_type = 'node'");
|
||||
$query->join('forum', 'f', 'n.vid = f.vid');
|
||||
$query->addExpression('COUNT(n.nid)', 'topic_count');
|
||||
$query->addExpression('SUM(ces.comment_count)', 'comment_count');
|
||||
$this->forumStatistics = $query
|
||||
->fields('f', array('tid'))
|
||||
->condition('n.status', 1)
|
||||
->condition('n.default_langcode', 1)
|
||||
->groupBy('tid')
|
||||
->addTag('node_access')
|
||||
->execute()
|
||||
->fetchAllAssoc('tid');
|
||||
}
|
||||
|
||||
if (!empty($this->forumStatistics[$tid])) {
|
||||
return $this->forumStatistics[$tid];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getChildren($vid, $tid) {
|
||||
if (!empty($this->forumChildren[$tid])) {
|
||||
return $this->forumChildren[$tid];
|
||||
}
|
||||
$forums = array();
|
||||
$_forums = $this->entityManager->getStorage('taxonomy_term')->loadTree($vid, $tid, NULL, TRUE);
|
||||
foreach ($_forums as $forum) {
|
||||
// Merge in the topic and post counters.
|
||||
if (($count = $this->getForumStatistics($forum->id()))) {
|
||||
$forum->num_topics = $count->topic_count;
|
||||
$forum->num_posts = $count->topic_count + $count->comment_count;
|
||||
}
|
||||
else {
|
||||
$forum->num_topics = 0;
|
||||
$forum->num_posts = 0;
|
||||
}
|
||||
|
||||
// Merge in last post details.
|
||||
$forum->last_post = $this->getLastPost($forum->id());
|
||||
$forums[$forum->id()] = $forum;
|
||||
}
|
||||
|
||||
$this->forumChildren[$tid] = $forums;
|
||||
return $forums;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getIndex() {
|
||||
if ($this->index) {
|
||||
return $this->index;
|
||||
}
|
||||
|
||||
$vid = $this->configFactory->get('forum.settings')->get('vocabulary');
|
||||
$index = $this->entityManager->getStorage('taxonomy_term')->create(array(
|
||||
'tid' => 0,
|
||||
'container' => 1,
|
||||
'parents' => array(),
|
||||
'isIndex' => TRUE,
|
||||
'vid' => $vid
|
||||
));
|
||||
|
||||
// Load the tree below.
|
||||
$index->forums = $this->getChildren($vid, 0);
|
||||
$this->index = $index;
|
||||
return $index;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function resetCache() {
|
||||
// Reset the index.
|
||||
$this->index = NULL;
|
||||
// Reset history.
|
||||
$this->history = array();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getParents($tid) {
|
||||
return $this->entityManager->getStorage('taxonomy_term')->loadAllParents($tid);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function checkNodeType(NodeInterface $node) {
|
||||
// Fetch information about the forum field.
|
||||
$field_definitions = $this->entityManager->getFieldDefinitions('node', $node->bundle());
|
||||
return !empty($field_definitions['taxonomy_forums']);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function unreadTopics($term, $uid) {
|
||||
$query = $this->connection->select('node_field_data', 'n');
|
||||
$query->join('forum', 'f', 'n.vid = f.vid AND f.tid = :tid', array(':tid' => $term));
|
||||
$query->leftJoin('history', 'h', 'n.nid = h.nid AND h.uid = :uid', array(':uid' => $uid));
|
||||
$query->addExpression('COUNT(n.nid)', 'count');
|
||||
return $query
|
||||
->condition('status', 1)
|
||||
// @todo This should be actually filtering on the desired node status
|
||||
// field language and just fall back to the default language.
|
||||
->condition('n.default_langcode', 1)
|
||||
->condition('n.created', HISTORY_READ_LIMIT, '>')
|
||||
->isNull('h.nid')
|
||||
->addTag('node_access')
|
||||
->execute()
|
||||
->fetchField();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function __sleep() {
|
||||
$vars = $this->defaultSleep();
|
||||
// Do not serialize static cache.
|
||||
unset($vars['history'], $vars['index'], $vars['lastPostData'], $vars['forumChildren'], $vars['forumStatistics']);
|
||||
return $vars;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function __wakeup() {
|
||||
$this->defaultWakeup();
|
||||
// Initialize static cache.
|
||||
$this->history = array();
|
||||
$this->lastPostData = array();
|
||||
$this->forumChildren = array();
|
||||
$this->forumStatistics = array();
|
||||
$this->index = NULL;
|
||||
}
|
||||
|
||||
}
|
||||
99
core/modules/forum/src/ForumManagerInterface.php
Normal file
99
core/modules/forum/src/ForumManagerInterface.php
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumManagerInterface.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum;
|
||||
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
use Drupal\node\NodeInterface;
|
||||
|
||||
/**
|
||||
* Provides forum manager interface.
|
||||
*/
|
||||
interface ForumManagerInterface {
|
||||
|
||||
/**
|
||||
* Gets list of forum topics.
|
||||
*
|
||||
* @param int $tid
|
||||
* Term ID.
|
||||
* @param \Drupal\Core\Session\AccountInterface $account
|
||||
* Account to fetch topics for.
|
||||
*
|
||||
* @return array
|
||||
* Array with keys 'topics' and 'header'.
|
||||
*/
|
||||
public function getTopics($tid, AccountInterface $account);
|
||||
|
||||
/**
|
||||
* Utility method to fetch the child forums for a given forum.
|
||||
*
|
||||
* @param int $vid
|
||||
* The forum vocabulary ID.
|
||||
* @param int $tid
|
||||
* The forum ID to fetch the children for.
|
||||
*
|
||||
* @return array
|
||||
* Array of children.
|
||||
*/
|
||||
public function getChildren($vid, $tid);
|
||||
|
||||
/**
|
||||
* Generates and returns the forum index.
|
||||
*
|
||||
* The forum index is a pseudo term that provides an overview of all forums.
|
||||
*
|
||||
* @return \Drupal\taxonomy\TermInterface
|
||||
* A pseudo term representing the overview of all forums.
|
||||
*/
|
||||
public function getIndex();
|
||||
|
||||
/**
|
||||
* Resets the ForumManager index and history.
|
||||
*/
|
||||
public function resetCache();
|
||||
|
||||
/**
|
||||
* Fetches the parent forums for a given forum.
|
||||
*
|
||||
* @param int $tid
|
||||
* Term ID.
|
||||
*
|
||||
* @return array
|
||||
* Array of parent terms.
|
||||
*
|
||||
* @deprecated Scheduled to be removed in 9.0.x, see
|
||||
* https://www.drupal.org/node/2371593.
|
||||
*/
|
||||
public function getParents($tid);
|
||||
|
||||
/**
|
||||
* Checks whether a node can be used in a forum, based on its content type.
|
||||
*
|
||||
* @param \Drupal\node\NodeInterface $node
|
||||
* A node entity.
|
||||
*
|
||||
* @return bool
|
||||
* Boolean indicating if the node can be assigned to a forum.
|
||||
*/
|
||||
public function checkNodeType(NodeInterface $node);
|
||||
|
||||
/**
|
||||
* Calculates the number of new posts in a forum that the user has not yet read.
|
||||
*
|
||||
* Nodes are new if they are newer than HISTORY_READ_LIMIT.
|
||||
*
|
||||
* @param int $term
|
||||
* The term ID of the forum.
|
||||
* @param int $uid
|
||||
* The user ID.
|
||||
*
|
||||
* @return
|
||||
* The number of new posts in the forum that have not been read by the user.
|
||||
*/
|
||||
public function unreadTopics($term, $uid);
|
||||
|
||||
}
|
||||
84
core/modules/forum/src/ForumSettingsForm.php
Normal file
84
core/modules/forum/src/ForumSettingsForm.php
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumSettingsForm.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum;
|
||||
|
||||
use Drupal\Core\Form\ConfigFormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
|
||||
/**
|
||||
* Configure forum settings for this site.
|
||||
*/
|
||||
class ForumSettingsForm extends ConfigFormBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'forum_admin_settings';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function getEditableConfigNames() {
|
||||
return ['forum.settings'];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state) {
|
||||
$config = $this->config('forum.settings');
|
||||
|
||||
$options = array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500);
|
||||
$form['forum_hot_topic'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => $this->t('Hot topic threshold'),
|
||||
'#default_value' => $config->get('topics.hot_threshold'),
|
||||
'#options' => array_combine($options, $options),
|
||||
'#description' => $this->t('The number of replies a topic must have to be considered "hot".'),
|
||||
);
|
||||
$options = array(10, 25, 50, 75, 100);
|
||||
$form['forum_per_page'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => $this->t('Topics per page'),
|
||||
'#default_value' => $config->get('topics.page_limit'),
|
||||
'#options' => array_combine($options, $options),
|
||||
'#description' => $this->t('Default number of forum topics displayed per page.'),
|
||||
);
|
||||
$forder = array(
|
||||
1 => $this->t('Date - newest first'),
|
||||
2 => $this->t('Date - oldest first'),
|
||||
3 => $this->t('Posts - most active first'),
|
||||
4 => $this->t('Posts - least active first')
|
||||
);
|
||||
$form['forum_order'] = array(
|
||||
'#type' => 'radios',
|
||||
'#title' => $this->t('Default order'),
|
||||
'#default_value' => $config->get('topics.order'),
|
||||
'#options' => $forder,
|
||||
'#description' => $this->t('Default display order for topics.'),
|
||||
);
|
||||
|
||||
return parent::buildForm($form, $form_state);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$this->config('forum.settings')
|
||||
->set('topics.hot_threshold', $form_state->getValue('forum_hot_topic'))
|
||||
->set('topics.page_limit', $form_state->getValue('forum_per_page'))
|
||||
->set('topics.order', $form_state->getValue('forum_order'))
|
||||
->save();
|
||||
|
||||
parent::submitForm($form, $form_state);
|
||||
}
|
||||
|
||||
}
|
||||
139
core/modules/forum/src/ForumUninstallValidator.php
Normal file
139
core/modules/forum/src/ForumUninstallValidator.php
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\ForumUninstallValidator.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum;
|
||||
|
||||
use Drupal\Core\Config\ConfigFactoryInterface;
|
||||
use Drupal\Core\Entity\EntityManagerInterface;
|
||||
use Drupal\Core\Entity\Query\QueryFactory;
|
||||
use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
|
||||
use Drupal\Core\StringTranslation\StringTranslationTrait;
|
||||
use Drupal\Core\StringTranslation\TranslationInterface;
|
||||
use Drupal\taxonomy\VocabularyInterface;
|
||||
|
||||
/**
|
||||
* Prevents forum module from being uninstalled whilst any forum nodes exist
|
||||
* or there are any terms in the forum vocabulary.
|
||||
*/
|
||||
class ForumUninstallValidator implements ModuleUninstallValidatorInterface {
|
||||
|
||||
use StringTranslationTrait;
|
||||
|
||||
/**
|
||||
* The field storage config storage.
|
||||
*
|
||||
* @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
|
||||
*/
|
||||
protected $vocabularyStorage;
|
||||
|
||||
/**
|
||||
* The entity query factory.
|
||||
*
|
||||
* @var \Drupal\Core\Entity\Query\QueryFactory
|
||||
*/
|
||||
protected $queryFactory;
|
||||
|
||||
/**
|
||||
* The config factory.
|
||||
*
|
||||
* @var \Drupal\Core\Config\ConfigFactoryInterface
|
||||
*/
|
||||
protected $configFactory;
|
||||
|
||||
/**
|
||||
* Constructs a new ForumUninstallValidator.
|
||||
*
|
||||
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
|
||||
* The entity manager.
|
||||
* @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
|
||||
* The entity query factory.
|
||||
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
|
||||
* The config factory.
|
||||
* @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
|
||||
* The string translation service.
|
||||
*/
|
||||
public function __construct(EntityManagerInterface $entity_manager, QueryFactory $query_factory, ConfigFactoryInterface $config_factory, TranslationInterface $string_translation) {
|
||||
$this->vocabularyStorage = $entity_manager->getStorage('taxonomy_vocabulary');
|
||||
$this->queryFactory = $query_factory;
|
||||
$this->configFactory = $config_factory;
|
||||
$this->stringTranslation = $string_translation;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function validate($module) {
|
||||
$reasons = [];
|
||||
if ($module == 'forum') {
|
||||
if ($this->hasForumNodes()) {
|
||||
$reasons[] = $this->t('To uninstall Forum, first delete all <em>Forum</em> content');
|
||||
}
|
||||
|
||||
$vocabulary = $this->getForumVocabulary();
|
||||
if ($this->hasTermsForVocabulary($vocabulary)) {
|
||||
if ($vocabulary->access('view')) {
|
||||
$reasons[] = $this->t('To uninstall Forum, first delete all <a href="@url">%vocabulary</a> terms', [
|
||||
'%vocabulary' => $vocabulary->label(),
|
||||
'@url' => $vocabulary->url('overview-form'),
|
||||
]);
|
||||
}
|
||||
else {
|
||||
$reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms', [
|
||||
'%vocabulary' => $vocabulary->label()
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $reasons;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if there are any forum nodes or not.
|
||||
*
|
||||
* @return bool
|
||||
* TRUE if there are forum nodes, FALSE otherwise.
|
||||
*/
|
||||
protected function hasForumNodes() {
|
||||
$nodes = $this->queryFactory->get('node')
|
||||
->condition('type', 'forum')
|
||||
->accessCheck(FALSE)
|
||||
->range(0, 1)
|
||||
->execute();
|
||||
return !empty($nodes);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if there are any taxonomy terms for a specified vocabulary.
|
||||
*
|
||||
* @param \Drupal\taxonomy\VocabularyInterface $vocabulary
|
||||
* The vocabulary to check for terms.
|
||||
*
|
||||
* @return bool
|
||||
* TRUE if there are terms for this vocabulary, FALSE otherwise.
|
||||
*/
|
||||
protected function hasTermsForVocabulary(VocabularyInterface $vocabulary) {
|
||||
$terms = $this->queryFactory->get('taxonomy_term')
|
||||
->condition('vid', $vocabulary->id())
|
||||
->accessCheck(FALSE)
|
||||
->range(0, 1)
|
||||
->execute();
|
||||
return !empty($terms);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the vocabulary configured for forums.
|
||||
*
|
||||
* @return \Drupal\taxonomy\VocabularyInterface
|
||||
* The vocabulary entity for forums.
|
||||
*/
|
||||
protected function getForumVocabulary() {
|
||||
$vid = $this->configFactory->get('forum.settings')->get('vocabulary');
|
||||
return $this->vocabularyStorage->load($vid);
|
||||
}
|
||||
|
||||
}
|
||||
33
core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php
Normal file
33
core/modules/forum/src/Plugin/Block/ActiveTopicsBlock.php
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Plugin\Block\ActiveTopicsBlock.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Plugin\Block;
|
||||
|
||||
/**
|
||||
* Provides an 'Active forum topics' block.
|
||||
*
|
||||
* @Block(
|
||||
* id = "forum_active_block",
|
||||
* admin_label = @Translation("Active forum topics"),
|
||||
* category = @Translation("Lists (Views)")
|
||||
* )
|
||||
*/
|
||||
class ActiveTopicsBlock extends ForumBlockBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function buildForumQuery() {
|
||||
return db_select('forum_index', 'f')
|
||||
->fields('f')
|
||||
->addTag('node_access')
|
||||
->addMetaData('base_table', 'forum_index')
|
||||
->orderBy('f.last_comment_timestamp', 'DESC')
|
||||
->range(0, $this->configuration['block_count']);
|
||||
}
|
||||
|
||||
}
|
||||
101
core/modules/forum/src/Plugin/Block/ForumBlockBase.php
Normal file
101
core/modules/forum/src/Plugin/Block/ForumBlockBase.php
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Plugin\Block\ForumBlockBase.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Plugin\Block;
|
||||
|
||||
use Drupal\Core\Access\AccessResult;
|
||||
use Drupal\Core\Block\BlockBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Session\AccountInterface;
|
||||
use Drupal\Core\Cache\Cache;
|
||||
use Drupal\Core\Url;
|
||||
|
||||
/**
|
||||
* Provides a base class for Forum blocks.
|
||||
*/
|
||||
abstract class ForumBlockBase extends BlockBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function build() {
|
||||
$result = $this->buildForumQuery()->execute();
|
||||
$elements = array();
|
||||
if ($node_title_list = node_title_list($result)) {
|
||||
$elements['forum_list'] = $node_title_list;
|
||||
$elements['forum_more'] = array(
|
||||
'#type' => 'more_link',
|
||||
'#url' => Url::fromRoute('forum.index'),
|
||||
'#attributes' => array('title' => $this->t('Read the latest forum topics.')),
|
||||
);
|
||||
}
|
||||
return $elements;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the select query to use for this forum block.
|
||||
*
|
||||
* @return \Drupal\Core\Database\Query\Select
|
||||
* A Select object.
|
||||
*/
|
||||
abstract protected function buildForumQuery();
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function defaultConfiguration() {
|
||||
return array(
|
||||
'properties' => array(
|
||||
'administrative' => TRUE,
|
||||
),
|
||||
'block_count' => 5,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function blockAccess(AccountInterface $account) {
|
||||
return AccessResult::allowedIfHasPermission($account, 'access content');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function blockForm($form, FormStateInterface $form_state) {
|
||||
$range = range(2, 20);
|
||||
$form['block_count'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => $this->t('Number of topics'),
|
||||
'#default_value' => $this->configuration['block_count'],
|
||||
'#options' => array_combine($range, $range),
|
||||
);
|
||||
return $form;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function blockSubmit($form, FormStateInterface $form_state) {
|
||||
$this->configuration['block_count'] = $form_state->getValue('block_count');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getCacheContexts() {
|
||||
return ['user.node_grants:view'];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getCacheTags() {
|
||||
return ['node_list'];
|
||||
}
|
||||
|
||||
}
|
||||
32
core/modules/forum/src/Plugin/Block/NewTopicsBlock.php
Normal file
32
core/modules/forum/src/Plugin/Block/NewTopicsBlock.php
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Plugin\Block\NewTopicsBlock.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Plugin\Block;
|
||||
|
||||
/**
|
||||
* Provides a 'New forum topics' block.
|
||||
*
|
||||
* @Block(
|
||||
* id = "forum_new_block",
|
||||
* admin_label = @Translation("New forum topics"),
|
||||
* category = @Translation("Lists (Views)")
|
||||
* )
|
||||
*/
|
||||
class NewTopicsBlock extends ForumBlockBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function buildForumQuery() {
|
||||
return db_select('forum_index', 'f')
|
||||
->fields('f')
|
||||
->addTag('node_access')
|
||||
->addMetaData('base_table', 'forum_index')
|
||||
->orderBy('f.created', 'DESC')
|
||||
->range(0, $this->configuration['block_count']);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Plugin\Validation\Constraint\ForumLeafConstraint.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Plugin\Validation\Constraint;
|
||||
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
|
||||
/**
|
||||
* Checks that the node is assigned only a "leaf" term in the forum taxonomy.
|
||||
*
|
||||
* @Constraint(
|
||||
* id = "ForumLeaf",
|
||||
* label = @Translation("Forum leaf", context = "Validation"),
|
||||
* )
|
||||
*/
|
||||
class ForumLeafConstraint extends Constraint {
|
||||
|
||||
public $selectForum = 'Select a forum.';
|
||||
public $noLeafMessage = 'The item %forum is a forum container, not a forum. Select one of the forums below instead.';
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Plugin\Validation\Constraint\ForumLeafConstraintValidator.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Plugin\Validation\Constraint;
|
||||
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Symfony\Component\Validator\Constraint;
|
||||
use Symfony\Component\Validator\ConstraintValidator;
|
||||
|
||||
/**
|
||||
* Validates the ForumLeaf constraint.
|
||||
*/
|
||||
class ForumLeafConstraintValidator extends ConstraintValidator {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function validate($items, Constraint $constraint) {
|
||||
$item = $items->first();
|
||||
if (!isset($item)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Verify that a term has been selected.
|
||||
if (!$item->entity) {
|
||||
$this->context->addViolation($constraint->selectForum);
|
||||
}
|
||||
|
||||
// The forum_container flag must not be set.
|
||||
if (!empty($item->entity->forum_container->value)) {
|
||||
$this->context->addViolation($constraint->noLeafMessage, array('%forum' => $item->entity->getName()));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
183
core/modules/forum/src/Tests/ForumBlockTest.php
Normal file
183
core/modules/forum/src/Tests/ForumBlockTest.php
Normal file
|
|
@ -0,0 +1,183 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumBlockTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\Core\Datetime\DrupalDateTime;
|
||||
|
||||
/**
|
||||
* Tests the forum blocks.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumBlockTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('forum', 'block');
|
||||
|
||||
/**
|
||||
* A user with various administrative privileges.
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Create users.
|
||||
$this->adminUser = $this->drupalCreateUser(array(
|
||||
'access administration pages',
|
||||
'administer blocks',
|
||||
'administer nodes',
|
||||
'create forum content',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the "New forum topics" block.
|
||||
*/
|
||||
public function testNewForumTopicsBlock() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Enable the new forum topics block.
|
||||
$block = $this->drupalPlaceBlock('forum_new_block');
|
||||
$this->drupalGet('');
|
||||
|
||||
// Create 5 forum topics.
|
||||
$topics = $this->createForumTopics();
|
||||
|
||||
|
||||
$this->assertLink(t('More'), 0, 'New forum topics block has a "more"-link.');
|
||||
$this->assertLinkByHref('forum', 0, 'New forum topics block has a "more"-link.');
|
||||
|
||||
// We expect all 5 forum topics to appear in the "New forum topics" block.
|
||||
foreach ($topics as $topic) {
|
||||
$this->assertLink($topic, 0, format_string('Forum topic @topic found in the "New forum topics" block.', array('@topic' => $topic)));
|
||||
}
|
||||
|
||||
// Configure the new forum topics block to only show 2 topics.
|
||||
$block->getPlugin()->setConfigurationValue('block_count', 2);
|
||||
$block->save();
|
||||
|
||||
$this->drupalGet('');
|
||||
// We expect only the 2 most recent forum topics to appear in the "New forum
|
||||
// topics" block.
|
||||
for ($index = 0; $index < 5; $index++) {
|
||||
if (in_array($index, array(3, 4))) {
|
||||
$this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "New forum topics" block.', array('@topic' => $topics[$index])));
|
||||
}
|
||||
else {
|
||||
$this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "New forum topics" block.', array('@topic' => $topics[$index])));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the "Active forum topics" block.
|
||||
*/
|
||||
public function testActiveForumTopicsBlock() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Create 10 forum topics.
|
||||
$topics = $this->createForumTopics(10);
|
||||
|
||||
// Comment on the first 5 topics.
|
||||
$date = new DrupalDateTime();
|
||||
for ($index = 0; $index < 5; $index++) {
|
||||
// Get the node from the topic title.
|
||||
$node = $this->drupalGetNodeByTitle($topics[$index]);
|
||||
$date->modify('+1 minute');
|
||||
$comment = entity_create('comment', array(
|
||||
'entity_id' => $node->id(),
|
||||
'field_name' => 'comment_forum',
|
||||
'entity_type' => 'node',
|
||||
'node_type' => 'node_type_' . $node->bundle(),
|
||||
'subject' => $this->randomString(20),
|
||||
'comment_body' => $this->randomString(256),
|
||||
'created' => $date->getTimestamp(),
|
||||
));
|
||||
$comment->save();
|
||||
}
|
||||
|
||||
// Enable the block.
|
||||
$block = $this->drupalPlaceBlock('forum_active_block');
|
||||
$this->drupalGet('');
|
||||
$this->assertLink(t('More'), 0, 'Active forum topics block has a "more"-link.');
|
||||
$this->assertLinkByHref('forum', 0, 'Active forum topics block has a "more"-link.');
|
||||
|
||||
// We expect the first 5 forum topics to appear in the "Active forum topics"
|
||||
// block.
|
||||
$this->drupalGet('<front>');
|
||||
for ($index = 0; $index < 10; $index++) {
|
||||
if ($index < 5) {
|
||||
$this->assertLink($topics[$index], 0, format_string('Forum topic @topic found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
|
||||
}
|
||||
else {
|
||||
$this->assertNoText($topics[$index], format_string('Forum topic @topic not found in the "Active forum topics" block.', array('@topic' => $topics[$index])));
|
||||
}
|
||||
}
|
||||
|
||||
// Configure the active forum block to only show 2 topics.
|
||||
$block->getPlugin()->setConfigurationValue('block_count', 2);
|
||||
$block->save();
|
||||
|
||||
$this->drupalGet('');
|
||||
|
||||
// We expect only the 2 forum topics with most recent comments to appear in
|
||||
// the "Active forum topics" block.
|
||||
for ($index = 0; $index < 10; $index++) {
|
||||
if (in_array($index, array(3, 4))) {
|
||||
$this->assertLink($topics[$index], 0, 'Forum topic found in the "Active forum topics" block.');
|
||||
}
|
||||
else {
|
||||
$this->assertNoText($topics[$index], 'Forum topic not found in the "Active forum topics" block.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a forum topic.
|
||||
*
|
||||
* @return string
|
||||
* The title of the newly generated topic.
|
||||
*/
|
||||
protected function createForumTopics($count = 5) {
|
||||
$topics = array();
|
||||
$date = new DrupalDateTime();
|
||||
$date->modify('-24 hours');
|
||||
|
||||
for ($index = 0; $index < $count; $index++) {
|
||||
// Generate a random subject/body.
|
||||
$title = $this->randomMachineName(20);
|
||||
$body = $this->randomMachineName(200);
|
||||
// Forum posts are ordered by timestamp, so force a unique timestamp by
|
||||
// changing the date.
|
||||
$date->modify('+1 minute');
|
||||
|
||||
$edit = array(
|
||||
'title[0][value]' => $title,
|
||||
'body[0][value]' => $body,
|
||||
// Forum posts are ordered by timestamp, so force a unique timestamp by
|
||||
// adding the index.
|
||||
'created[0][value][date]' => $date->format('Y-m-d'),
|
||||
'created[0][value][time]' => $date->format('H:i:s'),
|
||||
);
|
||||
|
||||
// Create the forum topic, preselecting the forum ID via a URL parameter.
|
||||
$this->drupalPostForm('node/add/forum', $edit, t('Save and publish'), array('query' => array('forum_id' => 1)));
|
||||
$topics[] = $title;
|
||||
}
|
||||
|
||||
return $topics;
|
||||
}
|
||||
}
|
||||
87
core/modules/forum/src/Tests/ForumIndexTest.php
Normal file
87
core/modules/forum/src/Tests/ForumIndexTest.php
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumIndexTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests the forum index listing.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumIndexTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('taxonomy', 'comment', 'forum');
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
// Create a test user.
|
||||
$web_user = $this->drupalCreateUser(['create forum content', 'edit own forum content', 'edit any forum content', 'administer nodes', 'administer forums']);
|
||||
$this->drupalLogin($web_user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the forum index for published and unpublished nodes.
|
||||
*/
|
||||
function testForumIndexStatus() {
|
||||
// The forum ID to use.
|
||||
$tid = 1;
|
||||
|
||||
// Create a test node.
|
||||
$title = $this->randomMachineName(20);
|
||||
$edit = array(
|
||||
'title[0][value]' => $title,
|
||||
'body[0][value]' => $this->randomMachineName(200),
|
||||
);
|
||||
|
||||
// Create the forum topic, preselecting the forum ID via a URL parameter.
|
||||
$this->drupalGet("forum/$tid");
|
||||
$this->clickLink(t('Add new @node_type', array('@node_type' => 'Forum topic')));
|
||||
$this->assertUrl('node/add/forum', array('query' => array('forum_id' => $tid)));
|
||||
$this->drupalPostForm(NULL, $edit, t('Save and publish'));
|
||||
|
||||
// Check that the node exists in the database.
|
||||
$node = $this->drupalGetNodeByTitle($title);
|
||||
$this->assertTrue(!empty($node), 'New forum node found in database.');
|
||||
|
||||
// Create a child forum.
|
||||
$edit = array(
|
||||
'name[0][value]' => $this->randomMachineName(20),
|
||||
'description[0][value]' => $this->randomMachineName(200),
|
||||
'parent[0]' => $tid,
|
||||
);
|
||||
$this->drupalPostForm('admin/structure/forum/add/forum', $edit, t('Save'));
|
||||
$tid_child = $tid + 1;
|
||||
|
||||
// Verify that the node appears on the index.
|
||||
$this->drupalGet('forum/' . $tid);
|
||||
$this->assertText($title, 'Published forum topic appears on index.');
|
||||
$this->assertCacheTag('node_list');
|
||||
$this->assertCacheTag('config:node.type.forum');
|
||||
$this->assertCacheTag('comment_list');
|
||||
$this->assertCacheTag('node:' . $node->id());
|
||||
$this->assertCacheTag('taxonomy_term:' . $tid);
|
||||
$this->assertCacheTag('taxonomy_term:' . $tid_child);
|
||||
|
||||
|
||||
// Unpublish the node.
|
||||
$this->drupalPostForm('node/' . $node->id() . '/edit', array(), t('Save and unpublish'));
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
$this->assertText(t('Access denied'), 'Unpublished node is no longer accessible.');
|
||||
|
||||
// Verify that the node no longer appears on the index.
|
||||
$this->drupalGet('forum/' . $tid);
|
||||
$this->assertNoText($title, 'Unpublished forum topic no longer appears on index.');
|
||||
}
|
||||
}
|
||||
91
core/modules/forum/src/Tests/ForumNodeAccessTest.php
Normal file
91
core/modules/forum/src/Tests/ForumNodeAccessTest.php
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumNodeAccessTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\node\Entity\NodeType;
|
||||
|
||||
/**
|
||||
* Tests forum block view for private node access.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumNodeAccessTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('node', 'comment', 'forum', 'taxonomy', 'tracker', 'node_access_test', 'block');
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
node_access_rebuild();
|
||||
node_access_test_add_field(NodeType::load('forum'));
|
||||
\Drupal::state()->set('node_access_test.private', TRUE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates some users and creates a public node and a private node.
|
||||
*
|
||||
* Adds both active forum topics and new forum topics blocks to the sidebar.
|
||||
* Tests to ensure private node/public node access is respected on blocks.
|
||||
*/
|
||||
function testForumNodeAccess() {
|
||||
// Create some users.
|
||||
$access_user = $this->drupalCreateUser(array('node test view'));
|
||||
$no_access_user = $this->drupalCreateUser();
|
||||
$admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules', 'administer blocks', 'create forum content'));
|
||||
|
||||
$this->drupalLogin($admin_user);
|
||||
|
||||
// Create a private node.
|
||||
$private_node_title = $this->randomMachineName(20);
|
||||
$edit = array(
|
||||
'title[0][value]' => $private_node_title,
|
||||
'body[0][value]' => $this->randomMachineName(200),
|
||||
'private[0][value]' => TRUE,
|
||||
);
|
||||
$this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => 1)));
|
||||
$private_node = $this->drupalGetNodeByTitle($private_node_title);
|
||||
$this->assertTrue(!empty($private_node), 'New private forum node found in database.');
|
||||
|
||||
// Create a public node.
|
||||
$public_node_title = $this->randomMachineName(20);
|
||||
$edit = array(
|
||||
'title[0][value]' => $public_node_title,
|
||||
'body[0][value]' => $this->randomMachineName(200),
|
||||
);
|
||||
$this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => 1)));
|
||||
$public_node = $this->drupalGetNodeByTitle($public_node_title);
|
||||
$this->assertTrue(!empty($public_node), 'New public forum node found in database.');
|
||||
|
||||
|
||||
// Enable the new and active forum blocks.
|
||||
$this->drupalPlaceBlock('forum_active_block');
|
||||
$this->drupalPlaceBlock('forum_new_block');
|
||||
|
||||
// Test for $access_user.
|
||||
$this->drupalLogin($access_user);
|
||||
$this->drupalGet('');
|
||||
|
||||
// Ensure private node and public node are found.
|
||||
$this->assertText($private_node->getTitle(), 'Private node found in block by $access_user');
|
||||
$this->assertText($public_node->getTitle(), 'Public node found in block by $access_user');
|
||||
|
||||
// Test for $no_access_user.
|
||||
$this->drupalLogin($no_access_user);
|
||||
$this->drupalGet('');
|
||||
|
||||
// Ensure private node is not found but public is found.
|
||||
$this->assertNoText($private_node->getTitle(), 'Private node not found in block by $no_access_user');
|
||||
$this->assertText($public_node->getTitle(), 'Public node found in block by $no_access_user');
|
||||
}
|
||||
|
||||
}
|
||||
680
core/modules/forum/src/Tests/ForumTest.php
Normal file
680
core/modules/forum/src/Tests/ForumTest.php
Normal file
|
|
@ -0,0 +1,680 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumTest.
|
||||
*
|
||||
* Tests for forum.module.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\Core\Entity\Entity\EntityFormDisplay;
|
||||
use Drupal\Core\Entity\Entity\EntityViewDisplay;
|
||||
use Drupal\Core\Entity\EntityInterface;
|
||||
use Drupal\Core\Link;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\taxonomy\Entity\Vocabulary;
|
||||
|
||||
/**
|
||||
* Create, view, edit, delete, and change forum entries and verify its
|
||||
* consistency in the database.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help');
|
||||
|
||||
/**
|
||||
* A user with various administrative privileges.
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* A user that can create forum topics and edit its own topics.
|
||||
*/
|
||||
protected $editOwnTopicsUser;
|
||||
|
||||
/**
|
||||
* A user that can create, edit, and delete forum topics.
|
||||
*/
|
||||
protected $editAnyTopicsUser;
|
||||
|
||||
/**
|
||||
* A user with no special privileges.
|
||||
*/
|
||||
protected $webUser;
|
||||
|
||||
/**
|
||||
* An administrative user who can bypass comment approval.
|
||||
*/
|
||||
protected $postCommentUser;
|
||||
|
||||
/**
|
||||
* An array representing a forum container.
|
||||
*/
|
||||
protected $forumContainer;
|
||||
|
||||
/**
|
||||
* An array representing a forum.
|
||||
*/
|
||||
protected $forum;
|
||||
|
||||
/**
|
||||
* An array representing a root forum.
|
||||
*/
|
||||
protected $rootForum;
|
||||
|
||||
/**
|
||||
* An array of forum topic node IDs.
|
||||
*/
|
||||
protected $nids;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalPlaceBlock('system_breadcrumb_block');
|
||||
|
||||
// Create users.
|
||||
$this->adminUser = $this->drupalCreateUser(array(
|
||||
'access administration pages',
|
||||
'administer modules',
|
||||
'administer blocks',
|
||||
'administer forums',
|
||||
'administer menu',
|
||||
'administer taxonomy',
|
||||
'create forum content',
|
||||
'access comments',
|
||||
));
|
||||
$this->editAnyTopicsUser = $this->drupalCreateUser(array(
|
||||
'access administration pages',
|
||||
'create forum content',
|
||||
'edit any forum content',
|
||||
'delete any forum content',
|
||||
));
|
||||
$this->editOwnTopicsUser = $this->drupalCreateUser(array(
|
||||
'create forum content',
|
||||
'edit own forum content',
|
||||
'delete own forum content',
|
||||
));
|
||||
$this->webUser = $this->drupalCreateUser();
|
||||
$this->postCommentUser = $this->drupalCreateUser(array(
|
||||
'administer content types',
|
||||
'create forum content',
|
||||
'post comments',
|
||||
'skip comment approval',
|
||||
'access comments',
|
||||
));
|
||||
$this->drupalPlaceBlock('help_block', array('region' => 'help'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests forum functionality through the admin and user interfaces.
|
||||
*/
|
||||
function testForum() {
|
||||
//Check that the basic forum install creates a default forum topic
|
||||
$this->drupalGet('/forum');
|
||||
// Look for the "General discussion" default forum
|
||||
$this->assertRaw(t('<a href="'. Url::fromRoute('forum.page', ['taxonomy_term' => 1])->toString() .'">General discussion</a>'), "Found the default forum at the /forum listing");
|
||||
|
||||
// Check the presence of expected cache tags.
|
||||
$this->assertCacheTag('config:forum.settings');
|
||||
|
||||
$this->drupalGet(Url::fromRoute('forum.page', ['taxonomy_term' => 1]));
|
||||
$this->assertCacheTag('config:forum.settings');
|
||||
|
||||
// Do the admin tests.
|
||||
$this->doAdminTests($this->adminUser);
|
||||
|
||||
// Check display order.
|
||||
$display = EntityViewDisplay::load('node.forum.default');
|
||||
$body = $display->getComponent('body');
|
||||
$comment = $display->getComponent('comment_forum');
|
||||
$taxonomy = $display->getComponent('taxonomy_forums');
|
||||
|
||||
// Assert field order is body » taxonomy » comments.
|
||||
$this->assertTrue($taxonomy['weight'] < $body['weight']);
|
||||
$this->assertTrue($body['weight'] < $comment['weight']);
|
||||
|
||||
// Check form order.
|
||||
$display = EntityFormDisplay::load('node.forum.default');
|
||||
$body = $display->getComponent('body');
|
||||
$comment = $display->getComponent('comment_forum');
|
||||
$taxonomy = $display->getComponent('taxonomy_forums');
|
||||
|
||||
// Assert category comes before body in order.
|
||||
$this->assertTrue($taxonomy['weight'] < $body['weight']);
|
||||
|
||||
$this->generateForumTopics();
|
||||
|
||||
// Login an unprivileged user to view the forum topics and generate an
|
||||
// active forum topics list.
|
||||
$this->drupalLogin($this->webUser);
|
||||
// Verify that this user is shown a message that they may not post content.
|
||||
$this->drupalGet('forum/' . $this->forum['tid']);
|
||||
$this->assertText(t('You are not allowed to post new content in the forum'), "Authenticated user without permission to post forum content is shown message in local tasks to that effect.");
|
||||
|
||||
// Log in, and do basic tests for a user with permission to edit any forum
|
||||
// content.
|
||||
$this->doBasicTests($this->editAnyTopicsUser, TRUE);
|
||||
// Create a forum node authored by this user.
|
||||
$any_topics_user_node = $this->createForumTopic($this->forum, FALSE);
|
||||
|
||||
// Log in, and do basic tests for a user with permission to edit only its
|
||||
// own forum content.
|
||||
$this->doBasicTests($this->editOwnTopicsUser, FALSE);
|
||||
// Create a forum node authored by this user.
|
||||
$own_topics_user_node = $this->createForumTopic($this->forum, FALSE);
|
||||
// Verify that this user cannot edit forum content authored by another user.
|
||||
$this->verifyForums($any_topics_user_node, FALSE, 403);
|
||||
|
||||
// Verify that this user is shown a local task to add new forum content.
|
||||
$this->drupalGet('forum');
|
||||
$this->assertLink(t('Add new Forum topic'));
|
||||
$this->drupalGet('forum/' . $this->forum['tid']);
|
||||
$this->assertLink(t('Add new Forum topic'));
|
||||
|
||||
// Login a user with permission to edit any forum content.
|
||||
$this->drupalLogin($this->editAnyTopicsUser);
|
||||
// Verify that this user can edit forum content authored by another user.
|
||||
$this->verifyForums($own_topics_user_node, TRUE);
|
||||
|
||||
// Verify the topic and post counts on the forum page.
|
||||
$this->drupalGet('forum');
|
||||
|
||||
// Verify row for testing forum.
|
||||
$forum_arg = array(':forum' => 'forum-list-' . $this->forum['tid']);
|
||||
|
||||
// Topics cell contains number of topics and number of unread topics.
|
||||
$xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__topics"]', $forum_arg);
|
||||
$topics = $this->xpath($xpath);
|
||||
$topics = trim($topics[0]);
|
||||
$this->assertEqual($topics, '6', 'Number of topics found.');
|
||||
|
||||
// Verify the number of unread topics.
|
||||
$unread_topics = $this->container->get('forum_manager')->unreadTopics($this->forum['tid'], $this->editAnyTopicsUser->id());
|
||||
$unread_topics = \Drupal::translation()->formatPlural($unread_topics, '1 new post', '@count new posts');
|
||||
$xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__topics"]//a', $forum_arg);
|
||||
$this->assertFieldByXPath($xpath, $unread_topics, 'Number of unread topics found.');
|
||||
// Verify that the forum name is in the unread topics text.
|
||||
$xpath = $this->buildXPathQuery('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
|
||||
$this->assertFieldByXpath($xpath, $this->forum['name'], 'Forum name found in unread topics text.');
|
||||
|
||||
// Verify total number of posts in forum.
|
||||
$xpath = $this->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
|
||||
$this->assertFieldByXPath($xpath, '6', 'Number of posts found.');
|
||||
|
||||
// Test loading multiple forum nodes on the front page.
|
||||
$this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content', 'post comments')));
|
||||
$this->drupalPostForm('admin/structure/types/manage/forum', array('options[promote]' => 'promote'), t('Save content type'));
|
||||
$this->createForumTopic($this->forum, FALSE);
|
||||
$this->createForumTopic($this->forum, FALSE);
|
||||
$this->drupalGet('node');
|
||||
|
||||
// Test adding a comment to a forum topic.
|
||||
$node = $this->createForumTopic($this->forum, FALSE);
|
||||
$edit = array();
|
||||
$edit['comment_body[0][value]'] = $this->randomMachineName();
|
||||
$this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Test editing a forum topic that has a comment.
|
||||
$this->drupalLogin($this->editAnyTopicsUser);
|
||||
$this->drupalGet('forum/' . $this->forum['tid']);
|
||||
$this->drupalPostForm('node/' . $node->id() . '/edit', array(), t('Save'));
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Test the root forum page title change.
|
||||
$this->drupalGet('forum');
|
||||
$this->assertTitle(t('Forums | Drupal'));
|
||||
$vocabulary = Vocabulary::load($this->forum['vid']);
|
||||
$vocabulary->set('name', 'Discussions');
|
||||
$vocabulary->save();
|
||||
$this->drupalGet('forum');
|
||||
$this->assertTitle(t('Discussions | Drupal'));
|
||||
|
||||
// Test anonymous action link.
|
||||
$this->drupalLogout();
|
||||
$this->drupalGet('forum/' . $this->forum['tid']);
|
||||
$this->assertLink(t('Log in to post new content in the forum.'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that forum nodes can't be added without a parent.
|
||||
*
|
||||
* Verifies that forum nodes are not created without choosing "forum" from the
|
||||
* select list.
|
||||
*/
|
||||
function testAddOrphanTopic() {
|
||||
// Must remove forum topics to test creating orphan topics.
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$tids = \Drupal::entityQuery('taxonomy_term')
|
||||
->condition('vid', $vid)
|
||||
->execute();
|
||||
entity_delete_multiple('taxonomy_term', $tids);
|
||||
|
||||
// Create an orphan forum item.
|
||||
$edit = array();
|
||||
$edit['title[0][value]'] = $this->randomMachineName(10);
|
||||
$edit['body[0][value]'] = $this->randomMachineName(120);
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->drupalPostForm('node/add/forum', $edit, t('Save'));
|
||||
|
||||
$nid_count = db_query('SELECT COUNT(nid) FROM {node}')->fetchField();
|
||||
$this->assertEqual(0, $nid_count, 'A forum node was not created when missing a forum vocabulary.');
|
||||
|
||||
// Reset the defaults for future tests.
|
||||
\Drupal::service('module_installer')->install(array('forum'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs admin tests on the admin user.
|
||||
*
|
||||
* @param object $user
|
||||
* The logged-in user.
|
||||
*/
|
||||
private function doAdminTests($user) {
|
||||
// Login the user.
|
||||
$this->drupalLogin($user);
|
||||
|
||||
// Add forum to the Tools menu.
|
||||
$edit = array();
|
||||
$this->drupalPostForm('admin/structure/menu/manage/tools', $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Edit forum taxonomy.
|
||||
// Restoration of the settings fails and causes subsequent tests to fail.
|
||||
$this->editForumVocabulary();
|
||||
// Create forum container.
|
||||
$this->forumContainer = $this->createForum('container');
|
||||
// Verify "edit container" link exists and functions correctly.
|
||||
$this->drupalGet('admin/structure/forum');
|
||||
// Verify help text is shown.
|
||||
$this->assertText(t('Forums contain forum topics. Use containers to group related forums'));
|
||||
// Verify action links are there.
|
||||
$this->assertLink('Add forum');
|
||||
$this->assertLink('Add container');
|
||||
$this->clickLink('edit container');
|
||||
$this->assertRaw('Edit container', 'Followed the link to edit the container');
|
||||
// Create forum inside the forum container.
|
||||
$this->forum = $this->createForum('forum', $this->forumContainer['tid']);
|
||||
// Verify the "edit forum" link exists and functions correctly.
|
||||
$this->drupalGet('admin/structure/forum');
|
||||
$this->clickLink('edit forum');
|
||||
$this->assertRaw('Edit forum', 'Followed the link to edit the forum');
|
||||
// Navigate back to forum structure page.
|
||||
$this->drupalGet('admin/structure/forum');
|
||||
// Create second forum in container, destined to be deleted below.
|
||||
$delete_forum = $this->createForum('forum', $this->forumContainer['tid']);
|
||||
// Save forum overview.
|
||||
$this->drupalPostForm('admin/structure/forum/', array(), t('Save'));
|
||||
$this->assertRaw(t('The configuration options have been saved.'));
|
||||
// Delete this second forum.
|
||||
$this->deleteForum($delete_forum['tid']);
|
||||
// Create forum at the top (root) level.
|
||||
$this->rootForum = $this->createForum('forum');
|
||||
|
||||
// Test vocabulary form alterations.
|
||||
$this->drupalGet('admin/structure/taxonomy/manage/forums');
|
||||
$this->assertFieldByName('op', t('Save'), 'Save button found.');
|
||||
$this->assertNoFieldByName('op', t('Delete'), 'Delete button not found.');
|
||||
|
||||
// Test term edit form alterations.
|
||||
$this->drupalGet('taxonomy/term/' . $this->forumContainer['tid'] . '/edit');
|
||||
// Test parent field been hidden by forum module.
|
||||
$this->assertNoField('parent[]', 'Parent field not found.');
|
||||
|
||||
// Create a default vocabulary named "Tags".
|
||||
$description = 'Use tags to group articles on similar topics into categories.';
|
||||
$help = 'Enter a comma-separated list of words to describe your content.';
|
||||
$vocabulary = entity_create('taxonomy_vocabulary', array(
|
||||
'name' => 'Tags',
|
||||
'description' => $description,
|
||||
'vid' => 'tags',
|
||||
'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
|
||||
'help' => $help,
|
||||
));
|
||||
$vocabulary->save();
|
||||
// Test tags vocabulary form is not affected.
|
||||
$this->drupalGet('admin/structure/taxonomy/manage/tags');
|
||||
$this->assertFieldByName('op', t('Save'), 'Save button found.');
|
||||
$this->assertLink(t('Delete'));
|
||||
// Test tags vocabulary term form is not affected.
|
||||
$this->drupalGet('admin/structure/taxonomy/manage/tags/add');
|
||||
$this->assertField('parent[]', 'Parent field found.');
|
||||
// Test relations widget exists.
|
||||
$relations_widget = $this->xpath("//details[@id='edit-relations']");
|
||||
$this->assertTrue(isset($relations_widget[0]), 'Relations widget element found.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Edits the forum taxonomy.
|
||||
*/
|
||||
function editForumVocabulary() {
|
||||
// Backup forum taxonomy.
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$original_vocabulary = Vocabulary::load($vid);
|
||||
|
||||
// Generate a random name and description.
|
||||
$edit = array(
|
||||
'name' => $this->randomMachineName(10),
|
||||
'description' => $this->randomMachineName(100),
|
||||
);
|
||||
|
||||
// Edit the vocabulary.
|
||||
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $original_vocabulary->id(), $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
$this->assertRaw(t('Updated vocabulary %name.', array('%name' => $edit['name'])), 'Vocabulary was edited');
|
||||
|
||||
// Grab the newly edited vocabulary.
|
||||
$current_vocabulary = Vocabulary::load($vid);
|
||||
|
||||
// Make sure we actually edited the vocabulary properly.
|
||||
$this->assertEqual($current_vocabulary->label(), $edit['name'], 'The name was updated');
|
||||
$this->assertEqual($current_vocabulary->getDescription(), $edit['description'], 'The description was updated');
|
||||
|
||||
// Restore the original vocabulary's name and description.
|
||||
$current_vocabulary->set('name', $original_vocabulary->label());
|
||||
$current_vocabulary->set('description', $original_vocabulary->getDescription());
|
||||
$current_vocabulary->save();
|
||||
// Reload vocabulary to make sure changes are saved.
|
||||
$current_vocabulary = Vocabulary::load($vid);
|
||||
$this->assertEqual($current_vocabulary->label(), $original_vocabulary->label(), 'The original vocabulary settings were restored');
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a forum container or a forum.
|
||||
*
|
||||
* @param string $type
|
||||
* The forum type (forum container or forum).
|
||||
* @param int $parent
|
||||
* The forum parent. This defaults to 0, indicating a root forum.
|
||||
*
|
||||
* @return \Drupal\Core\Database\StatementInterface
|
||||
* The created taxonomy term data.
|
||||
*/
|
||||
function createForum($type, $parent = 0) {
|
||||
// Generate a random name/description.
|
||||
$name = $this->randomMachineName(10);
|
||||
$description = $this->randomMachineName(100);
|
||||
|
||||
$edit = array(
|
||||
'name[0][value]' => $name,
|
||||
'description[0][value]' => $description,
|
||||
'parent[0]' => $parent,
|
||||
'weight' => '0',
|
||||
);
|
||||
|
||||
// Create forum.
|
||||
$this->drupalPostForm('admin/structure/forum/add/' . $type, $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
$type = ($type == 'container') ? 'forum container' : 'forum';
|
||||
$this->assertRaw(
|
||||
t(
|
||||
'Created new @type %term.',
|
||||
array('%term' => $name, '@type' => t($type))
|
||||
),
|
||||
format_string('@type was created', array('@type' => ucfirst($type)))
|
||||
);
|
||||
|
||||
// Verify forum.
|
||||
$term = db_query("SELECT * FROM {taxonomy_term_field_data} t WHERE t.vid = :vid AND t.name = :name AND t.description__value = :desc AND t.default_langcode = 1", array(':vid' => $this->config('forum.settings')->get('vocabulary'), ':name' => $name, ':desc' => $description))->fetchAssoc();
|
||||
$this->assertTrue(!empty($term), 'The ' . $type . ' exists in the database');
|
||||
|
||||
// Verify forum hierarchy.
|
||||
$tid = $term['tid'];
|
||||
$parent_tid = db_query("SELECT t.parent FROM {taxonomy_term_hierarchy} t WHERE t.tid = :tid", array(':tid' => $tid))->fetchField();
|
||||
$this->assertTrue($parent == $parent_tid, 'The ' . $type . ' is linked to its container');
|
||||
|
||||
$forum = $this->container->get('entity.manager')->getStorage('taxonomy_term')->load($tid);
|
||||
$this->assertEqual(($type == 'forum container'), (bool) $forum->forum_container->value);
|
||||
return $term;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a forum.
|
||||
*
|
||||
* @param int $tid
|
||||
* The forum ID.
|
||||
*/
|
||||
function deleteForum($tid) {
|
||||
// Delete the forum.
|
||||
$this->drupalGet('admin/structure/forum/edit/forum/' . $tid);
|
||||
$this->clickLink(t('Delete'));
|
||||
$this->assertText('Are you sure you want to delete the forum');
|
||||
$this->assertNoText('Add forum');
|
||||
$this->assertNoText('Add forum container');
|
||||
$this->drupalPostForm(NULL, array(), t('Delete'));
|
||||
|
||||
// Assert that the forum no longer exists.
|
||||
$this->drupalGet('forum/' . $tid);
|
||||
$this->assertResponse(404, 'The forum was not found');
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs basic tests on the indicated user.
|
||||
*
|
||||
* @param \Drupal\Core\Session\AccountInterface $user
|
||||
* The logged in user.
|
||||
* @param bool $admin
|
||||
* User has 'access administration pages' privilege.
|
||||
*/
|
||||
private function doBasicTests($user, $admin) {
|
||||
// Login the user.
|
||||
$this->drupalLogin($user);
|
||||
// Attempt to create forum topic under a container.
|
||||
$this->createForumTopic($this->forumContainer, TRUE);
|
||||
// Create forum node.
|
||||
$node = $this->createForumTopic($this->forum, FALSE);
|
||||
// Verify the user has access to all the forum nodes.
|
||||
$this->verifyForums($node, $admin);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests a forum with a new post displays properly.
|
||||
*/
|
||||
function testForumWithNewPost() {
|
||||
// Login as the first user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Create a forum container.
|
||||
$this->forumContainer = $this->createForum('container');
|
||||
// Create a forum.
|
||||
$this->forum = $this->createForum('forum');
|
||||
// Create a topic.
|
||||
$node = $this->createForumTopic($this->forum, FALSE);
|
||||
|
||||
// Login as a second user.
|
||||
$this->drupalLogin($this->postCommentUser);
|
||||
// Post a reply to the topic.
|
||||
$edit = array();
|
||||
$edit['subject[0][value]'] = $this->randomMachineName();
|
||||
$edit['comment_body[0][value]'] = $this->randomMachineName();
|
||||
$this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Test replying to a comment.
|
||||
$this->clickLink('Reply');
|
||||
$this->assertResponse(200);
|
||||
$this->assertFieldByName('comment_body[0][value]');
|
||||
|
||||
// Login as the first user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Check that forum renders properly.
|
||||
$this->drupalGet("forum/{$this->forum['tid']}");
|
||||
$this->assertResponse(200);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a forum topic.
|
||||
*
|
||||
* @param array $forum
|
||||
* A forum array.
|
||||
* @param bool $container
|
||||
* TRUE if $forum is a container; FALSE otherwise.
|
||||
*
|
||||
* @return object
|
||||
* The created topic node.
|
||||
*/
|
||||
function createForumTopic($forum, $container = FALSE) {
|
||||
// Generate a random subject/body.
|
||||
$title = $this->randomMachineName(20);
|
||||
$body = $this->randomMachineName(200);
|
||||
|
||||
$edit = array(
|
||||
'title[0][value]' => $title,
|
||||
'body[0][value]' => $body,
|
||||
);
|
||||
$tid = $forum['tid'];
|
||||
|
||||
// Create the forum topic, preselecting the forum ID via a URL parameter.
|
||||
$this->drupalPostForm('node/add/forum', $edit, t('Save'), array('query' => array('forum_id' => $tid)));
|
||||
|
||||
$type = t('Forum topic');
|
||||
if ($container) {
|
||||
$this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), 'Forum topic was not created');
|
||||
$this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'Error message was shown');
|
||||
return;
|
||||
}
|
||||
else {
|
||||
$this->assertRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), 'Forum topic was created');
|
||||
$this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), 'No error message was shown');
|
||||
}
|
||||
|
||||
// Retrieve node object, ensure that the topic was created and in the proper forum.
|
||||
$node = $this->drupalGetNodeByTitle($title);
|
||||
$this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title)));
|
||||
$this->assertEqual($node->taxonomy_forums->target_id, $tid, 'Saved forum topic was in the expected forum');
|
||||
|
||||
// View forum topic.
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
$this->assertRaw($title, 'Subject was found');
|
||||
$this->assertRaw($body, 'Body was found');
|
||||
|
||||
return $node;
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies that the logged in user has access to a forum node.
|
||||
*
|
||||
* @param \Drupal\Core\Entity\EntityInterface $node
|
||||
* The node being checked.
|
||||
* @param bool $admin
|
||||
* Boolean to indicate whether the user can 'access administration pages'.
|
||||
* @param int $response
|
||||
* The expected HTTP response code.
|
||||
*/
|
||||
private function verifyForums(EntityInterface $node, $admin, $response = 200) {
|
||||
$response2 = ($admin) ? 200 : 403;
|
||||
|
||||
// View forum help node.
|
||||
$this->drupalGet('admin/help/forum');
|
||||
$this->assertResponse($response2);
|
||||
if ($response2 == 200) {
|
||||
$this->assertTitle(t('Forum | Drupal'), 'Forum help title was displayed');
|
||||
$this->assertText(t('Forum'), 'Forum help node was displayed');
|
||||
}
|
||||
|
||||
// View forum container page.
|
||||
$this->verifyForumView($this->forumContainer);
|
||||
// View forum page.
|
||||
$this->verifyForumView($this->forum, $this->forumContainer);
|
||||
// View root forum page.
|
||||
$this->verifyForumView($this->rootForum);
|
||||
|
||||
// View forum node.
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
$this->assertResponse(200);
|
||||
$this->assertTitle($node->label() . ' | Drupal', 'Forum node was displayed');
|
||||
$breadcrumb_build = array(
|
||||
Link::createFromRoute(t('Home'), '<front>'),
|
||||
Link::createFromRoute(t('Forums'), 'forum.index'),
|
||||
Link::createFromRoute($this->forumContainer['name'], 'forum.page', array('taxonomy_term' => $this->forumContainer['tid'])),
|
||||
Link::createFromRoute($this->forum['name'], 'forum.page', array('taxonomy_term' => $this->forum['tid'])),
|
||||
);
|
||||
$breadcrumb = array(
|
||||
'#theme' => 'breadcrumb',
|
||||
'#links' => $breadcrumb_build,
|
||||
);
|
||||
$this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
|
||||
|
||||
// View forum edit node.
|
||||
$this->drupalGet('node/' . $node->id() . '/edit');
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertTitle('Edit Forum topic ' . $node->label() . ' | Drupal', 'Forum edit node was displayed');
|
||||
}
|
||||
|
||||
if ($response == 200) {
|
||||
// Edit forum node (including moving it to another forum).
|
||||
$edit = array();
|
||||
$edit['title[0][value]'] = 'node/' . $node->id();
|
||||
$edit['body[0][value]'] = $this->randomMachineName(256);
|
||||
// Assume the topic is initially associated with $forum.
|
||||
$edit['taxonomy_forums'] = $this->rootForum['tid'];
|
||||
$edit['shadow'] = TRUE;
|
||||
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
|
||||
$this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit['title[0][value]'])), 'Forum node was edited');
|
||||
|
||||
// Verify topic was moved to a different forum.
|
||||
$forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", array(
|
||||
':nid' => $node->id(),
|
||||
':vid' => $node->getRevisionId(),
|
||||
))->fetchField();
|
||||
$this->assertTrue($forum_tid == $this->rootForum['tid'], 'The forum topic is linked to a different forum');
|
||||
|
||||
// Delete forum node.
|
||||
$this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
|
||||
$this->assertResponse($response);
|
||||
$this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title[0][value]'])), 'Forum node was deleted');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies the display of a forum page.
|
||||
*
|
||||
* @param array $forum
|
||||
* A row from the taxonomy_term_data table in an array.
|
||||
* @param array $parent
|
||||
* (optional) An array representing the forum's parent.
|
||||
*/
|
||||
private function verifyForumView($forum, $parent = NULL) {
|
||||
// View forum page.
|
||||
$this->drupalGet('forum/' . $forum['tid']);
|
||||
$this->assertResponse(200);
|
||||
$this->assertTitle($forum['name'] . ' | Drupal');
|
||||
|
||||
$breadcrumb_build = array(
|
||||
Link::createFromRoute(t('Home'), '<front>'),
|
||||
Link::createFromRoute(t('Forums'), 'forum.index'),
|
||||
);
|
||||
if (isset($parent)) {
|
||||
$breadcrumb_build[] = Link::createFromRoute($parent['name'], 'forum.page', array('taxonomy_term' => $parent['tid']));
|
||||
}
|
||||
|
||||
$breadcrumb = array(
|
||||
'#theme' => 'breadcrumb',
|
||||
'#links' => $breadcrumb_build,
|
||||
);
|
||||
$this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates forum topics.
|
||||
*/
|
||||
private function generateForumTopics() {
|
||||
$this->nids = array();
|
||||
for ($i = 0; $i < 5; $i++) {
|
||||
$node = $this->createForumTopic($this->forum, FALSE);
|
||||
$this->nids[] = $node->id();
|
||||
}
|
||||
}
|
||||
}
|
||||
153
core/modules/forum/src/Tests/ForumUninstallTest.php
Normal file
153
core/modules/forum/src/Tests/ForumUninstallTest.php
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumUninstallTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\comment\CommentInterface;
|
||||
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
|
||||
use Drupal\Core\DrupalKernel;
|
||||
use Drupal\Core\Session\UserSession;
|
||||
use Drupal\Core\Site\Settings;
|
||||
use Drupal\field\Entity\FieldStorageConfig;
|
||||
use Drupal\node\Entity\NodeType;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests forum module uninstallation.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumUninstallTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('forum');
|
||||
|
||||
/**
|
||||
* Tests if forum module uninstallation properly deletes the field.
|
||||
*/
|
||||
public function testForumUninstallWithField() {
|
||||
$this->drupalLogin($this->drupalCreateUser(['administer taxonomy', 'administer nodes', 'administer modules', 'delete any forum content', 'administer content types']));
|
||||
// Ensure that the field exists before uninstallation.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
|
||||
$this->assertNotNull($field_storage, 'The taxonomy_forums field storage exists.');
|
||||
|
||||
// Create a taxonomy term.
|
||||
$term = entity_create('taxonomy_term', array(
|
||||
'name' => t('A term'),
|
||||
'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
|
||||
'description' => '',
|
||||
'parent' => array(0),
|
||||
'vid' => 'forums',
|
||||
'forum_container' => 0,
|
||||
));
|
||||
$term->save();
|
||||
|
||||
// Create a forum node.
|
||||
$node = $this->drupalCreateNode(array(
|
||||
'title' => 'A forum post',
|
||||
'type' => 'forum',
|
||||
'taxonomy_forums' => array(array('target_id' => $term->id())),
|
||||
));
|
||||
|
||||
// Create at least one comment against the forum node.
|
||||
$comment = entity_create('comment', array(
|
||||
'entity_id' => $node->nid->value,
|
||||
'entity_type' => 'node',
|
||||
'field_name' => 'comment_forum',
|
||||
'pid' => 0,
|
||||
'uid' => 0,
|
||||
'status' => CommentInterface::PUBLISHED,
|
||||
'subject' => $this->randomMachineName(),
|
||||
'hostname' => '127.0.0.1',
|
||||
));
|
||||
$comment->save();
|
||||
|
||||
// Attempt to uninstall forum.
|
||||
$this->drupalGet('admin/modules/uninstall');
|
||||
// Assert forum is required.
|
||||
$this->assertNoFieldByName('uninstall[forum]');
|
||||
$this->assertText('To uninstall Forum, first delete all Forum content');
|
||||
|
||||
// Delete the node.
|
||||
$this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
|
||||
|
||||
// Attempt to uninstall forum.
|
||||
$this->drupalGet('admin/modules/uninstall');
|
||||
// Assert forum is still required.
|
||||
$this->assertNoFieldByName('uninstall[forum]');
|
||||
$this->assertText('To uninstall Forum, first delete all Forums terms');
|
||||
|
||||
// Delete any forum terms.
|
||||
$vid = $this->config('forum.settings')->get('vocabulary');
|
||||
$terms = entity_load_multiple_by_properties('taxonomy_term', ['vid' => $vid]);
|
||||
foreach ($terms as $term) {
|
||||
$term->delete();
|
||||
}
|
||||
|
||||
// Ensure that the forum node type can not be deleted.
|
||||
$this->drupalGet('admin/structure/types/manage/forum');
|
||||
$this->assertNoLink(t('Delete'));
|
||||
|
||||
// Now attempt to uninstall forum.
|
||||
$this->drupalGet('admin/modules/uninstall');
|
||||
// Assert forum is no longer required.
|
||||
$this->assertFieldByName('uninstall[forum]');
|
||||
$this->drupalPostForm('admin/modules/uninstall', array(
|
||||
'uninstall[forum]' => 1,
|
||||
), t('Uninstall'));
|
||||
$this->drupalPostForm(NULL, [], t('Uninstall'));
|
||||
|
||||
// Check that the field is now deleted.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
|
||||
$this->assertNull($field_storage, 'The taxonomy_forums field storage has been deleted.');
|
||||
|
||||
// Check that a node type with a machine name of forum can be created after
|
||||
// uninstalling the forum module and the node type is not locked.
|
||||
$edit = array(
|
||||
'name' => 'Forum',
|
||||
'title_label' => 'title for forum',
|
||||
'type' => 'forum',
|
||||
);
|
||||
$this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
|
||||
$this->assertTrue((bool) NodeType::load('forum'), 'Node type with machine forum created.');
|
||||
$this->drupalGet('admin/structure/types/manage/forum');
|
||||
$this->clickLink(t('Delete'));
|
||||
$this->drupalPostForm(NULL, array(), t('Delete'));
|
||||
$this->assertResponse(200);
|
||||
$this->assertFalse((bool) NodeType::load('forum'), 'Node type with machine forum deleted.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests uninstallation if the field storage has been deleted beforehand.
|
||||
*/
|
||||
public function testForumUninstallWithoutFieldStorage() {
|
||||
// Manually delete the taxonomy_forums field before module uninstallation.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
|
||||
$this->assertNotNull($field_storage, 'The taxonomy_forums field storage exists.');
|
||||
$field_storage->delete();
|
||||
|
||||
// Check that the field is now deleted.
|
||||
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
|
||||
$this->assertNull($field_storage, 'The taxonomy_forums field storage has been deleted.');
|
||||
|
||||
// Delete all terms in the Forums vocabulary. Uninstalling the forum module
|
||||
// will fail unless this is done.
|
||||
$terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => 'forums'));
|
||||
foreach($terms as $term) {
|
||||
$term->delete();
|
||||
}
|
||||
|
||||
// Ensure that uninstallation succeeds even if the field has already been
|
||||
// deleted manually beforehand.
|
||||
$this->container->get('module_installer')->uninstall(array('forum'));
|
||||
}
|
||||
|
||||
}
|
||||
70
core/modules/forum/src/Tests/ForumValidationTest.php
Normal file
70
core/modules/forum/src/Tests/ForumValidationTest.php
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\ForumValidationTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests;
|
||||
|
||||
use Drupal\node\Entity\Node;
|
||||
use Drupal\taxonomy\Entity\Term;
|
||||
use Drupal\system\Tests\Entity\EntityUnitTestBase;
|
||||
|
||||
/**
|
||||
* Tests forum validation constraints.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumValidationTest extends EntityUnitTestBase {
|
||||
|
||||
/**
|
||||
* Modules to install.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = ['node', 'options', 'comment', 'taxonomy', 'forum'];
|
||||
|
||||
/**
|
||||
* Tests the forum validation constraints.
|
||||
*/
|
||||
public function testValidation() {
|
||||
// Add a forum.
|
||||
$forum = Term::create([
|
||||
'name' => 'forum 1',
|
||||
'vid' => 'forums',
|
||||
'forum_container' => 0,
|
||||
]);
|
||||
|
||||
// Add a container.
|
||||
$container = Term::create([
|
||||
'name' => 'container 1',
|
||||
'vid' => 'forums',
|
||||
'forum_container' => 1,
|
||||
]);
|
||||
|
||||
// Add a forum post.
|
||||
$forum_post = Node::create([
|
||||
'type' => 'forum',
|
||||
'title' => 'Do these pants make my butt look big?',
|
||||
]);
|
||||
|
||||
$violations = $forum_post->validate();
|
||||
$this->assertEqual(count($violations), 1);
|
||||
$this->assertEqual($violations[0]->getMessage(), 'This value should not be null.');
|
||||
|
||||
// Add the forum term.
|
||||
$forum_post->set('taxonomy_forums', $forum);
|
||||
$violations = $forum_post->validate();
|
||||
$this->assertEqual(count($violations), 0);
|
||||
|
||||
// Try to use a container.
|
||||
$forum_post->set('taxonomy_forums', $container);
|
||||
$violations = $forum_post->validate();
|
||||
$this->assertEqual(count($violations), 1);
|
||||
$this->assertEqual($violations[0]->getMessage(), t('The item %forum is a forum container, not a forum. Select one of the forums below instead.', [
|
||||
'%forum' => $container->label(),
|
||||
]));
|
||||
}
|
||||
|
||||
}
|
||||
99
core/modules/forum/src/Tests/Views/ForumIntegrationTest.php
Normal file
99
core/modules/forum/src/Tests/Views/ForumIntegrationTest.php
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Contains \Drupal\forum\Tests\Views\ForumIntegrationTest.
|
||||
*/
|
||||
|
||||
namespace Drupal\forum\Tests\Views;
|
||||
|
||||
use Drupal\views\Views;
|
||||
use Drupal\views\Tests\ViewTestBase;
|
||||
use Drupal\views\Tests\ViewTestData;
|
||||
|
||||
/**
|
||||
* Tests the forum integration into views.
|
||||
*
|
||||
* @group forum
|
||||
*/
|
||||
class ForumIntegrationTest extends ViewTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('forum_test_views');
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = array('test_forum_index');
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
ViewTestData::createTestViews(get_class($this), array('forum_test_views'));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Tests the integration.
|
||||
*/
|
||||
public function testForumIntegration() {
|
||||
// Create a forum.
|
||||
$entity_manager = $this->container->get('entity.manager');
|
||||
$term = $entity_manager->getStorage('taxonomy_term')->create(array('vid' => 'forums', 'name' => $this->randomMachineName()));
|
||||
$term->save();
|
||||
|
||||
$comment_storage = $entity_manager->getStorage('comment');
|
||||
|
||||
// Create some nodes which are part of this forum with some comments.
|
||||
$nodes = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$node = $this->drupalCreateNode(array('type' => 'forum', 'taxonomy_forums' => array($term->id()), 'sticky' => $i == 0 ? NODE_STICKY : NODE_NOT_STICKY));
|
||||
$nodes[] = $node;
|
||||
}
|
||||
|
||||
$account = $this->drupalCreateUser(array('skip comment approval'));
|
||||
$this->drupalLogin($account);
|
||||
|
||||
$comments = array();
|
||||
foreach ($nodes as $index => $node) {
|
||||
for ($i = 0; $i <= $index; $i++) {
|
||||
$comment = $comment_storage->create(array('entity_type' => 'node', 'entity_id' => $node->id(), 'field_name' => 'comment_forum'));
|
||||
$comment->save();
|
||||
$comments[$comment->get('entity_id')->target_id][$comment->id()] = $comment;
|
||||
}
|
||||
}
|
||||
|
||||
$view = Views::getView('test_forum_index');
|
||||
$this->executeView($view);
|
||||
|
||||
$expected_result = array();
|
||||
$expected_result[] = array(
|
||||
'nid' => $nodes[0]->id(),
|
||||
'sticky' => NODE_STICKY,
|
||||
'comment_count' => 1.
|
||||
);
|
||||
$expected_result[] = array(
|
||||
'nid' => $nodes[1]->id(),
|
||||
'sticky' => NODE_NOT_STICKY,
|
||||
'comment_count' => 2.
|
||||
);
|
||||
$expected_result[] = array(
|
||||
'nid' => $nodes[2]->id(),
|
||||
'sticky' => NODE_NOT_STICKY,
|
||||
'comment_count' => 3.
|
||||
);
|
||||
$column_map = array(
|
||||
'nid' => 'nid',
|
||||
'forum_index_sticky' => 'sticky',
|
||||
'forum_index_comment_count' => 'comment_count',
|
||||
);
|
||||
$this->assertIdenticalResultset($view, $expected_result, $column_map);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in a new issue