Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #2861022: ForumForm and ContainerForm forms are rendered using wrong texts" 

This reverts commit 15ae76d090.
8.4.x
Lauri Eskola 2017-03-16 08:13:12 +02:00
parent 15ae76d090
commit 16b02ad8fb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/forum/src/Form/ContainerForm.php
View File

@ -20,8 +20,9 @@ class ContainerForm extends ForumForm {
* {@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);
$form = parent::form($form, $form_state, $taxonomy_term);
// Set the title and description of the name field.
$form['name']['#title'] = $this->t('Container name');

7
core/modules/forum/src/Form/ForumForm.php
View File

@ -29,8 +29,9 @@ class ForumForm extends TermForm {
* {@inheritdoc}
*/
public function form(array $form, FormStateInterface $form_state) {
// Build the bulk of the form from the parent form.
$form = parent::form($form, $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');
@ -47,7 +48,7 @@ class ForumForm extends TermForm {
// Our parent field is different to the taxonomy term.
$form['parent']['#tree'] = TRUE;
$form['parent'][0] = $this->forumParentSelect($this->entity->id(), $this->t('Parent'));
$form['parent'][0] = $this->forumParentSelect($taxonomy_term->id(), $this->t('Parent'));
$form['#theme_wrappers'] = ['form__forum'];
$this->forumFormType = $this->t('forum');