projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
taxonomy
/
src
/
Form
/
OverviewTerms.php
diff --git
a/web/core/modules/taxonomy/src/Form/OverviewTerms.php
b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
index df80a47035be0b522cbfd9cdf0809726bb8db4cb..f9e0d595982e6ef0e299ea708bcf7115e9399212 100644
(file)
--- a/
web/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/
web/core/modules/taxonomy/src/Form/OverviewTerms.php
@@
-241,6
+241,11
@@
class OverviewTerms extends FormBase {
$form['terms'] = [
'#type' => 'table',
'#empty' => $empty,
$form['terms'] = [
'#type' => 'table',
'#empty' => $empty,
+ '#header' => [
+ 'term' => $this->t('Name'),
+ 'operations' => $this->t('Operations'),
+ 'weight' => $this->t('Weight'),
+ ],
'#attributes' => [
'id' => 'taxonomy',
],
'#attributes' => [
'id' => 'taxonomy',
],
@@
-251,6
+256,11
@@
class OverviewTerms extends FormBase {
// all terms.
$change_weight_access = AccessResult::allowed();
foreach ($current_page as $key => $term) {
// all terms.
$change_weight_access = AccessResult::allowed();
foreach ($current_page as $key => $term) {
+ $form['terms'][$key] = [
+ 'term' => [],
+ 'operations' => [],
+ 'weight' => [],
+ ];
/** @var $term \Drupal\Core\Entity\EntityInterface */
$term = $this->entityManager->getTranslationFromContext($term);
$form['terms'][$key]['#term'] = $term;
/** @var $term \Drupal\Core\Entity\EntityInterface */
$term = $this->entityManager->getTranslationFromContext($term);
$form['terms'][$key]['#term'] = $term;
@@
-344,11
+354,8
@@
class OverviewTerms extends FormBase {
$row_position++;
}
$row_position++;
}
- $form['terms']['#header'] = [$this->t('Name')];
-
$this->renderer->addCacheableDependency($form['terms'], $change_weight_access);
if ($change_weight_access->isAllowed()) {
$this->renderer->addCacheableDependency($form['terms'], $change_weight_access);
if ($change_weight_access->isAllowed()) {
- $form['terms']['#header'][] = $this->t('Weight');
if ($parent_fields) {
$form['terms']['#tabledrag'][] = [
'action' => 'match',
if ($parent_fields) {
$form['terms']['#tabledrag'][] = [
'action' => 'match',
@@
-377,8
+384,6
@@
class OverviewTerms extends FormBase {
];
}
];
}
- $form['terms']['#header'][] = $this->t('Operations');
-
if (($taxonomy_vocabulary->getHierarchy() !== VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1) && $change_weight_access->isAllowed()) {
$form['actions'] = ['#type' => 'actions', '#tree' => FALSE];
$form['actions']['submit'] = [
if (($taxonomy_vocabulary->getHierarchy() !== VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1) && $change_weight_access->isAllowed()) {
$form['actions'] = ['#type' => 'actions', '#tree' => FALSE];
$form['actions']['submit'] = [
@@
-492,7
+497,7
@@
class OverviewTerms extends FormBase {
$vocabulary->setHierarchy($hierarchy);
$vocabulary->save();
}
$vocabulary->setHierarchy($hierarchy);
$vocabulary->save();
}
-
drupal_set_message
($this->t('The configuration options have been saved.'));
+
$this->messenger()->addStatus
($this->t('The configuration options have been saved.'));
}
/**
}
/**