diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 30fbb45..3ff0390 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -106,8 +106,10 @@ function forum_entity_type_build(array &$entity_types) { /** @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ // Register forum specific forms. $entity_types['taxonomy_term'] - ->setFormClass('forum', 'Drupal\forum\Form\ForumForm') - ->setFormClass('container', 'Drupal\forum\Form\ContainerForm') + ->setFormClass('forum_add', 'Drupal\forum\Form\ForumAddForm') + ->setFormClass('forum_edit', 'Drupal\forum\Form\ForumEditForm') + ->setFormClass('container_add', 'Drupal\forum\Form\ContainerAddForm') + ->setFormClass('container_edit', 'Drupal\forum\Form\ContainerEditForm') ->setLinkTemplate('forum-edit-container-form', '/admin/structure/forum/edit/container/{taxonomy_term}') ->setLinkTemplate('forum-delete-form', '/admin/structure/forum/delete/forum/{taxonomy_term}') ->setLinkTemplate('forum-edit-form', '/admin/structure/forum/edit/forum/{taxonomy_term}'); diff --git a/core/modules/forum/forum.routing.yml b/core/modules/forum/forum.routing.yml index 14e55e2..f1d14f1 100644 --- a/core/modules/forum/forum.routing.yml +++ b/core/modules/forum/forum.routing.yml @@ -49,7 +49,7 @@ forum.add_forum: entity.taxonomy_term.forum_edit_container_form: path: '/admin/structure/forum/edit/container/{taxonomy_term}' defaults: - _entity_form: 'taxonomy_term.container' + _entity_form: 'taxonomy_term.container_edit' _title: 'Edit container' requirements: _permission: 'administer forums' @@ -57,7 +57,7 @@ entity.taxonomy_term.forum_edit_container_form: entity.taxonomy_term.forum_edit_form: path: '/admin/structure/forum/edit/forum/{taxonomy_term}' defaults: - _entity_form: 'taxonomy_term.forum' + _entity_form: 'taxonomy_term.forum_edit' _title: 'Edit forum' requirements: _permission: 'administer forums' diff --git a/core/modules/forum/src/Controller/ForumController.php b/core/modules/forum/src/Controller/ForumController.php index 7f84a02..8efc176 100644 --- a/core/modules/forum/src/Controller/ForumController.php +++ b/core/modules/forum/src/Controller/ForumController.php @@ -262,7 +262,7 @@ public function addForum() { 'vid' => $vid, 'forum_controller' => 0, )); - return $this->entityFormBuilder()->getForm($taxonomy_term, 'forum'); + return $this->entityFormBuilder()->getForm($taxonomy_term, 'forum_add'); } /** @@ -277,7 +277,7 @@ public function addContainer() { 'vid' => $vid, 'forum_container' => 1, )); - return $this->entityFormBuilder()->getForm($taxonomy_term, 'container'); + return $this->entityFormBuilder()->getForm($taxonomy_term, 'container_add'); } /** diff --git a/core/modules/forum/src/Form/ContainerAddForm.php b/core/modules/forum/src/Form/ContainerAddForm.php new file mode 100644 index 0000000..15b502f --- /dev/null +++ b/core/modules/forum/src/Form/ContainerAddForm.php @@ -0,0 +1,27 @@ +setValue('tid', $term->id()); + 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' => \Drupal::l($this->t('Edit'), new Url('entity.taxonomy_term.forum_edit_form', array('taxonomy_term' => $term->id()))))); + } + +} diff --git a/core/modules/forum/src/Form/ContainerEditForm.php b/core/modules/forum/src/Form/ContainerEditForm.php new file mode 100644 index 0000000..907ad49 --- /dev/null +++ b/core/modules/forum/src/Form/ContainerEditForm.php @@ -0,0 +1,26 @@ +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' => \Drupal::l($this->t('Edit'), new Url('entity.taxonomy_term.forum_edit_form', array('taxonomy_term' => $term->id()))))); + } + +} diff --git a/core/modules/forum/src/Form/ContainerForm.php b/core/modules/forum/src/Form/ContainerForm.php deleted file mode 100644 index b7f62fc..0000000 --- a/core/modules/forum/src/Form/ContainerForm.php +++ /dev/null @@ -1,51 +0,0 @@ -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; - } - -} diff --git a/core/modules/forum/src/Form/ContainerFormBase.php b/core/modules/forum/src/Form/ContainerFormBase.php new file mode 100644 index 0000000..1dbdf0a --- /dev/null +++ b/core/modules/forum/src/Form/ContainerFormBase.php @@ -0,0 +1,51 @@ +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; + } + +} diff --git a/core/modules/forum/src/Form/ForumAddForm.php b/core/modules/forum/src/Form/ForumAddForm.php new file mode 100644 index 0000000..5137018 --- /dev/null +++ b/core/modules/forum/src/Form/ForumAddForm.php @@ -0,0 +1,42 @@ +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' => \Drupal::l($this->t('Edit'), new Url('entity.taxonomy_term.forum_edit_form', array('taxonomy_term' => $term->id()))))); + $form_state->setValue('tid', $term->id()); + } + +} diff --git a/core/modules/forum/src/Form/ForumEditForm.php b/core/modules/forum/src/Form/ForumEditForm.php new file mode 100644 index 0000000..ee62262 --- /dev/null +++ b/core/modules/forum/src/Form/ForumEditForm.php @@ -0,0 +1,60 @@ +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' => \Drupal::l($this->t('Edit'), new Url('entity.taxonomy_term.forum_edit_form', array('taxonomy_term' => $term->id()))))); + } + + /** + * {@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')) { + $route_info = $this->entity->urlInfo('forum-delete-form'); + $actions['delete']['#options'] = $route_info->getOptions(); + $actions['delete']['#route_name'] = $route_info->getRouteName(); + $actions['delete']['#route_parameters'] = $route_info->getRouteParameters(); + } + else { + unset($actions['delete']); + } + + return $actions; + } + +} diff --git a/core/modules/forum/src/Form/ForumForm.php b/core/modules/forum/src/Form/ForumForm.php index 1a517c0..c347455 100644 --- a/core/modules/forum/src/Form/ForumForm.php +++ b/core/modules/forum/src/Form/ForumForm.php @@ -9,12 +9,11 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; -use Drupal\taxonomy\TermForm; /** * Base form for forum term edit forms. */ -class ForumForm extends TermForm { +class ForumForm extends ForumFormBase { /** * Reusable type field to use in status messages. @@ -33,48 +32,6 @@ class ForumForm extends TermForm { /** * {@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'); @@ -100,73 +57,4 @@ public function save(array $form, FormStateInterface $form_state) { 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, - ); - } - } diff --git a/core/modules/forum/src/Form/ForumFormBase.php b/core/modules/forum/src/Form/ForumFormBase.php new file mode 100644 index 0000000..9b626dd --- /dev/null +++ b/core/modules/forum/src/Form/ForumFormBase.php @@ -0,0 +1,141 @@ +parent = array($form_state->getValue(array('parent', 0))); + + return $term; + } + + /** + * {@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 save(array $form, FormStateInterface $form_state) { + $term = $this->entity; + $term_storage = $this->entityManager->getStorage('taxonomy_term'); + $term_storage->save($term); + $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) { + // @todo Inject a taxonomy service when one exists. + $parents = $this->entityManager->getStorage('taxonomy_term')->loadParents($tid); + if ($parents) { + $parent = array_shift($parents); + $parent = $parent->id(); + } + else { + $parent = 0; + } + + $vid = $this->config('forum.settings')->get('vocabulary'); + // @todo Inject a taxonomy service when one exists. + $children = $this->entityManager->getStorage('taxonomy_term')->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; + + // @todo Inject a taxonomy service when one exists. + $tree = $this->entityManager->getStorage('taxonomy_term')->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, + ); + } +}