diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index 001dd97..2f3564d 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -5,6 +5,8 @@
* Administrative page callbacks for the Forum module.
*/
+use Drupal\taxonomy\Form\OverviewTerms;
+
/**
* Page callback: Returns a form for creating a new forum or container.
*
@@ -235,7 +237,9 @@ function forum_overview($form, &$form_state) {
$vid = $config->get('vocabulary');
$vocabulary = taxonomy_vocabulary_load($vid);
- $form = taxonomy_overview_terms($form, $form_state, $vocabulary);
+ // @todo temporary, will be fixed in http://drupal.org/node/1974210.
+ $overview = OverviewTerms::create(Drupal::getContainer());
+ $form = $overview->buildForm($form, $form_state, $vocabulary);
foreach (element_children($form['terms']) as $key) {
if (isset($form['terms'][$key]['#term'])) {
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
new file mode 100644
index 0000000..d773c0b
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -0,0 +1,482 @@
+entityManager = $entity_manager;
+ $this->config = $config_factory->get('taxonomy.settings');
+ $this->database = $connection;
+ $this->request = $request;
+ }
+
+ /**
+ * Injects plugin manager.
+ */
+ public static function create(Container $container) {
+ return new static(
+ $container->get('plugin.manager.entity'),
+ $container->get('config.factory'),
+ $container->get('database'),
+ $container->get('request')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormId() {
+ return 'taxonomy_overview_terms';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildForm(array $form, array $form_state, Vocabulary $taxonomy_vocabulary) {
+ global $pager_page_array, $pager_total, $pager_total_items;
+
+ // Check for confirmation forms.
+ if (isset($form_state['confirm_reset_alphabetical'])) {
+ // @todo this needs to be a separate route/controller for a confirm form.
+ // Will be fixed in http://drupal.org/node/1976296.
+ return taxonomy_vocabulary_confirm_reset_alphabetical($form, $form_state, $taxonomy_vocabulary->id());
+ }
+
+ $form_state['taxonomy']['vocabulary'] = $taxonomy_vocabulary;
+ $parent_fields = FALSE;
+
+ $page = isset($_GET['page']) ? $_GET['page'] : 0;
+ // Number of terms per page.
+ $page_increment = $this->config->get('terms_per_page_admin');
+ // Elements shown on this page.
+ $page_entries = 0;
+ // Elements at the root level before this page.
+ $before_entries = 0;
+ // Elements at the root level after this page.
+ $after_entries = 0;
+ // Elements at the root level on this page.
+ $root_entries = 0;
+
+ // Terms from previous and next pages are shown if the term tree would have
+ // been cut in the middle. Keep track of how many extra terms we show on each
+ // page of terms.
+ $back_step = NULL;
+ $forward_step = 0;
+
+ // An array of the terms to be displayed on this page.
+ $current_page = array();
+
+ $delta = 0;
+ $term_deltas = array();
+ // @todo taxonomy_get_tree needs to be converted to a service and injected.
+ // Will be fixed in http://drupal.org/node/1976298.
+ $tree = taxonomy_get_tree($taxonomy_vocabulary->id(), 0, NULL, TRUE);
+ $term = current($tree);
+ do {
+ // In case this tree is completely empty.
+ if (empty($term)) {
+ break;
+ }
+ $delta++;
+ // Count entries before the current page.
+ if ($page && ($page * $page_increment) > $before_entries && !isset($back_step)) {
+ $before_entries++;
+ continue;
+ }
+ // Count entries after the current page.
+ elseif ($page_entries > $page_increment && isset($complete_tree)) {
+ $after_entries++;
+ continue;
+ }
+
+ // Do not let a term start the page that is not at the root.
+ if (isset($term->depth) && ($term->depth > 0) && !isset($back_step)) {
+ $back_step = 0;
+ while ($pterm = prev($tree)) {
+ $before_entries--;
+ $back_step++;
+ if ($pterm->depth == 0) {
+ prev($tree);
+ // Jump back to the start of the root level parent.
+ continue 2;
+ }
+ }
+ }
+ $back_step = isset($back_step) ? $back_step : 0;
+
+ // Continue rendering the tree until we reach the a new root item.
+ if ($page_entries >= $page_increment + $back_step + 1 && $term->depth == 0 && $root_entries > 1) {
+ $complete_tree = TRUE;
+ // This new item at the root level is the first item on the next page.
+ $after_entries++;
+ continue;
+ }
+ if ($page_entries >= $page_increment + $back_step) {
+ $forward_step++;
+ }
+
+ // Finally, if we've gotten down this far, we're rendering a term on this page.
+ $page_entries++;
+ $term_deltas[$term->tid] = isset($term_deltas[$term->tid]) ? $term_deltas[$term->tid] + 1 : 0;
+ $key = 'tid:' . $term->tid . ':' . $term_deltas[$term->tid];
+
+ // Keep track of the first term displayed on this page.
+ if ($page_entries == 1) {
+ $form['#first_tid'] = $term->tid;
+ }
+ // Keep a variable to make sure at least 2 root elements are displayed.
+ if ($term->parents[0] == 0) {
+ $root_entries++;
+ }
+ $current_page[$key] = $term;
+ } while ($term = next($tree));
+
+ // Because we didn't use a pager query, set the necessary pager variables.
+ $total_entries = $before_entries + $page_entries + $after_entries;
+ $pager_total_items[0] = $total_entries;
+ $pager_page_array[0] = $page;
+ $pager_total[0] = ceil($total_entries / $page_increment);
+
+ // If this form was already submitted once, it's probably hit a validation
+ // error. Ensure the form is rebuilt in the same order as the user submitted.
+ if (!empty($form_state['input'])) {
+ // Get the $_POST order.
+ $order = array_flip(array_keys($form_state['input']['terms']));
+ // Update our form with the new order.
+ $current_page = array_merge($order, $current_page);
+ foreach ($current_page as $key => $term) {
+ // Verify this is a term for the current page and set at the current
+ // depth.
+ if (is_array($form_state['input']['terms'][$key]) && is_numeric($form_state['input']['terms'][$key]['term']['tid'])) {
+ $current_page[$key]->depth = $form_state['input']['terms'][$key]['term']['depth'];
+ }
+ else {
+ unset($current_page[$key]);
+ }
+ }
+ }
+
+ $errors = form_get_errors() != FALSE ? form_get_errors() : array();
+ $destination = drupal_get_destination();
+ $row_position = 0;
+ // Build the actual form.
+ $form['terms'] = array(
+ '#type' => 'table',
+ '#header' => array(t('Name'), t('Weight'), t('Operations')),
+ '#empty' => t('No terms available. Add term.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->id() . '/add'))),
+ '#attributes' => array(
+ 'id' => 'taxonomy',
+ ),
+ );
+ foreach ($current_page as $key => $term) {
+ // Save the term for the current page so we don't have to load it a second
+ // time.
+ $form['terms'][$key]['#term'] = (array) $term;
+ if (isset($term->parents)) {
+ $form['terms'][$key]['#term']['parent'] = $term->parent = $term->parents[0];
+ unset($form['terms'][$key]['#term']['parents'], $term->parents);
+ }
+
+ $form['terms'][$key]['term'] = array(
+ '#prefix' => isset($term->depth) && $term->depth > 0 ? theme('indentation', array('size' => $term->depth)) : '',
+ '#type' => 'link',
+ '#title' => $term->label(),
+ '#href' => "taxonomy/term/$term->tid",
+ );
+ if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
+ $parent_fields = TRUE;
+ $form['terms'][$key]['term']['tid'] = array(
+ '#type' => 'hidden',
+ '#value' => $term->tid,
+ '#attributes' => array(
+ 'class' => array('term-id'),
+ ),
+ );
+ $form['terms'][$key]['term']['parent'] = array(
+ '#type' => 'hidden',
+ // Yes, default_value on a hidden. It needs to be changeable by the
+ // javascript.
+ '#default_value' => $term->parent,
+ '#attributes' => array(
+ 'class' => array('term-parent'),
+ ),
+ );
+ $form['terms'][$key]['term']['depth'] = array(
+ '#type' => 'hidden',
+ // Same as above, the depth is modified by javascript, so it's a
+ // default_value.
+ '#default_value' => $term->depth,
+ '#attributes' => array(
+ 'class' => array('term-depth'),
+ ),
+ );
+ }
+ $form['terms'][$key]['weight'] = array(
+ '#type' => 'weight',
+ '#delta' => $delta,
+ '#title_display' => 'invisible',
+ '#title' => t('Weight for added term'),
+ '#default_value' => $term->weight,
+ '#attributes' => array(
+ 'class' => array('term-weight'),
+ ),
+ );
+ $operations = array(
+ 'edit' => array(
+ 'title' => t('edit'),
+ 'href' => 'taxonomy/term/' . $term->tid . '/edit',
+ 'query' => $destination,
+ ),
+ 'delete' => array(
+ 'title' => t('delete'),
+ 'href' => 'taxonomy/term/' . $term->tid . '/delete',
+ 'query' => $destination,
+ ),
+ );
+ if (module_invoke('translation_entity', 'translate_access', $term)) {
+ $operations['translate'] = array(
+ 'title' => t('translate'),
+ 'href' => 'taxonomy/term/' . $term->tid . '/translations',
+ 'query' => $destination,
+ );
+ }
+ $form['terms'][$key]['operations'] = array(
+ '#type' => 'operations',
+ '#links' => $operations,
+ );
+
+ $form['terms'][$key]['#attributes']['class'] = array();
+ if ($parent_fields) {
+ $form['terms'][$key]['#attributes']['class'][] = 'draggable';
+ }
+
+ // Add classes that mark which terms belong to previous and next pages.
+ if ($row_position < $back_step || $row_position >= $page_entries - $forward_step) {
+ $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-preview';
+ }
+
+ if ($row_position !== 0 && $row_position !== count($tree) - 1) {
+ if ($row_position == $back_step - 1 || $row_position == $page_entries - $forward_step - 1) {
+ $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-top';
+ }
+ elseif ($row_position == $back_step || $row_position == $page_entries - $forward_step) {
+ $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-bottom';
+ }
+ }
+
+ // Add an error class if this row contains a form error.
+ foreach ($errors as $error_key => $error) {
+ if (strpos($error_key, $key) === 0) {
+ $form['terms'][$key]['#attributes']['class'][] = 'error';
+ }
+ }
+ $row_position++;
+ }
+
+ if ($parent_fields) {
+ $form['terms']['#tabledrag'][] = array(
+ 'match',
+ 'parent',
+ 'term-parent',
+ 'term-parent',
+ 'term-id',
+ FALSE
+ );
+ $form['terms']['#tabledrag'][] = array(
+ 'depth',
+ 'group',
+ 'term-depth',
+ NULL,
+ NULL,
+ FALSE
+ );
+ $form['terms']['#attached']['library'][] = array('taxonomy', 'drupal.taxonomy');
+ $form['terms']['#attached']['js'][] = array(
+ 'data' => array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)),
+ 'type' => 'setting',
+ );
+ }
+ $form['terms']['#tabledrag'][] = array('order', 'sibling', 'term-weight');
+
+ if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
+ $form['actions'] = array('#type' => 'actions', '#tree' => FALSE);
+ $form['actions']['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Save'),
+ '#button_type' => 'primary',
+ );
+ $form['actions']['reset_alphabetical'] = array(
+ '#type' => 'submit',
+ '#value' => t('Reset to alphabetical')
+ );
+ $form_state['redirect'] = array($this->request->attributes->get('system_path'), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
+ }
+
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validateForm(array $form, array &$form_state) {}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array $form, array &$form_state) {
+ // @todo this needs to be in its own method.
+ if ($form_state['triggering_element']['#value'] == t('Reset to alphabetical')) {
+ // Execute the reset action.
+ if ($form_state['values']['reset_alphabetical'] === TRUE) {
+ // @todo this needs to be a method on the vocabulary storage controller.
+ // Will be fixed in http://drupal.org/node/1976296.
+ return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state);
+ }
+ // Rebuild the form to confirm the reset action.
+ $form_state['rebuild'] = TRUE;
+ $form_state['confirm_reset_alphabetical'] = TRUE;
+ return;
+ }
+
+ // Sort term order based on weight.
+ uasort($form_state['values']['terms'], 'drupal_sort_weight');
+
+ $vocabulary = $form_state['taxonomy']['vocabulary'];
+ // Update the current hierarchy type as we go.
+ $hierarchy = TAXONOMY_HIERARCHY_DISABLED;
+
+ $changed_terms = array();
+ // @todo convert taxonomy_get_tree() to a service and inject it.
+ // Will be fixed in http://drupal.org/node/1976298.
+ $tree = taxonomy_get_tree($vocabulary->id());
+
+ if (empty($tree)) {
+ return;
+ }
+
+ // Build a list of all terms that need to be updated on previous pages.
+ $weight = 0;
+ $term = (array) $tree[0];
+ while ($term['tid'] != $form['#first_tid']) {
+ if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
+ $term['parent'] = $term['parents'][0];
+ $term['weight'] = $weight;
+ $changed_terms[$term['tid']] = $term;
+ }
+ $weight++;
+ $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+ $term = (array) $tree[$weight];
+ }
+
+ // Renumber the current page weights and assign any new parents.
+ $level_weights = array();
+ foreach ($form_state['values']['terms'] as $tid => $values) {
+ if (isset($form['terms'][$tid]['#term'])) {
+ $term = $form['terms'][$tid]['#term'];
+ // Give terms at the root level a weight in sequence with terms on previous pages.
+ if ($values['term']['parent'] == 0 && $term['weight'] != $weight) {
+ $term['weight'] = $weight;
+ $changed_terms[$term['tid']] = $term;
+ }
+ // Terms not at the root level can safely start from 0 because they're all on this page.
+ elseif ($values['term']['parent'] > 0) {
+ $level_weights[$values['term']['parent']] = isset($level_weights[$values['term']['parent']]) ? $level_weights[$values['term']['parent']] + 1 : 0;
+ if ($level_weights[$values['term']['parent']] != $term['weight']) {
+ $term['weight'] = $level_weights[$values['term']['parent']];
+ $changed_terms[$term['tid']] = $term;
+ }
+ }
+ // Update any changed parents.
+ if ($values['term']['parent'] != $term['parent']) {
+ $term['parent'] = $values['term']['parent'];
+ $changed_terms[$term['tid']] = $term;
+ }
+ $hierarchy = $term['parent'] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+ $weight++;
+ }
+ }
+
+ // Build a list of all terms that need to be updated on following pages.
+ for ($weight; $weight < count($tree); $weight++) {
+ $term = (array) $tree[$weight];
+ if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
+ $term['parent'] = $term['parents'][0];
+ $term['weight'] = $weight;
+ $changed_terms[$term['tid']] = $term;
+ }
+ $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
+ }
+
+ // Save all updated terms.
+ foreach ($changed_terms as $changed) {
+ $term = (object) $changed;
+ // Update term_hierachy and term_data directly since we don't have a
+ // fully populated term object to save.
+ $this->database->update('taxonomy_term_hierarchy')
+ ->fields(array('parent' => $term->parent))
+ ->condition('tid', $term->tid, '=')
+ ->execute();
+
+ $this->database->update('taxonomy_term_data')
+ ->fields(array('weight' => $term->weight))
+ ->condition('tid', $term->tid, '=')
+ ->execute();
+ }
+
+ // Update the vocabulary hierarchy to flat or single hierarchy.
+ if ($vocabulary->hierarchy != $hierarchy) {
+ $vocabulary->hierarchy = $hierarchy;
+ $vocabulary->save();
+ }
+ drupal_set_message(t('The configuration options have been saved.'));
+ }
+
+}
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index d26501f..4d1cffd 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -103,277 +103,6 @@ function taxonomy_vocabulary_add() {
}
/**
- * Form builder for the taxonomy terms overview.
- *
- * Display a tree of all the terms in a vocabulary, with options to edit
- * each one. The form is made drag and drop by the theme function.
- *
- * @param Drupal\taxonomy\Plugin\Core\Entity\Vocabulary $vocabulary
- * The taxonomy vocabulary entity to list terms for.
- *
- * @ingroup forms
- * @see taxonomy_overview_terms_submit()
- * @see theme_taxonomy_overview_terms()
- */
-function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
- global $pager_page_array, $pager_total, $pager_total_items;
-
- // Check for confirmation forms.
- if (isset($form_state['confirm_reset_alphabetical'])) {
- return taxonomy_vocabulary_confirm_reset_alphabetical($form, $form_state, $vocabulary->id());
- }
-
- $form_state['taxonomy']['vocabulary'] = $vocabulary;
- $parent_fields = FALSE;
-
- $page = isset($_GET['page']) ? $_GET['page'] : 0;
- $page_increment = config('taxonomy.settings')->get('terms_per_page_admin'); // Number of terms per page.
- $page_entries = 0; // Elements shown on this page.
- $before_entries = 0; // Elements at the root level before this page.
- $after_entries = 0; // Elements at the root level after this page.
- $root_entries = 0; // Elements at the root level on this page.
-
- // Terms from previous and next pages are shown if the term tree would have
- // been cut in the middle. Keep track of how many extra terms we show on each
- // page of terms.
- $back_step = NULL;
- $forward_step = 0;
-
- // An array of the terms to be displayed on this page.
- $current_page = array();
-
- $delta = 0;
- $term_deltas = array();
- $tree = taxonomy_get_tree($vocabulary->id(), 0, NULL, TRUE);
- $term = current($tree);
- do {
- // In case this tree is completely empty.
- if (empty($term)) {
- break;
- }
- $delta++;
- // Count entries before the current page.
- if ($page && ($page * $page_increment) > $before_entries && !isset($back_step)) {
- $before_entries++;
- continue;
- }
- // Count entries after the current page.
- elseif ($page_entries > $page_increment && isset($complete_tree)) {
- $after_entries++;
- continue;
- }
-
- // Do not let a term start the page that is not at the root.
- if (isset($term->depth) && ($term->depth > 0) && !isset($back_step)) {
- $back_step = 0;
- while ($pterm = prev($tree)) {
- $before_entries--;
- $back_step++;
- if ($pterm->depth == 0) {
- prev($tree);
- continue 2; // Jump back to the start of the root level parent.
- }
- }
- }
- $back_step = isset($back_step) ? $back_step : 0;
-
- // Continue rendering the tree until we reach the a new root item.
- if ($page_entries >= $page_increment + $back_step + 1 && $term->depth == 0 && $root_entries > 1) {
- $complete_tree = TRUE;
- // This new item at the root level is the first item on the next page.
- $after_entries++;
- continue;
- }
- if ($page_entries >= $page_increment + $back_step) {
- $forward_step++;
- }
-
- // Finally, if we've gotten down this far, we're rendering a term on this page.
- $page_entries++;
- $term_deltas[$term->tid] = isset($term_deltas[$term->tid]) ? $term_deltas[$term->tid] + 1 : 0;
- $key = 'tid:' . $term->tid . ':' . $term_deltas[$term->tid];
-
- // Keep track of the first term displayed on this page.
- if ($page_entries == 1) {
- $form['#first_tid'] = $term->tid;
- }
- // Keep a variable to make sure at least 2 root elements are displayed.
- if ($term->parents[0] == 0) {
- $root_entries++;
- }
- $current_page[$key] = $term;
- } while ($term = next($tree));
-
- // Because we didn't use a pager query, set the necessary pager variables.
- $total_entries = $before_entries + $page_entries + $after_entries;
- $pager_total_items[0] = $total_entries;
- $pager_page_array[0] = $page;
- $pager_total[0] = ceil($total_entries / $page_increment);
-
- // If this form was already submitted once, it's probably hit a validation
- // error. Ensure the form is rebuilt in the same order as the user submitted.
- if (!empty($form_state['input'])) {
- $order = array_flip(array_keys($form_state['input']['terms'])); // Get the $_POST order.
- $current_page = array_merge($order, $current_page); // Update our form with the new order.
- foreach ($current_page as $key => $term) {
- // Verify this is a term for the current page and set at the current
- // depth.
- if (is_array($form_state['input']['terms'][$key]) && is_numeric($form_state['input']['terms'][$key]['term']['tid'])) {
- $current_page[$key]->depth = $form_state['input']['terms'][$key]['term']['depth'];
- }
- else {
- unset($current_page[$key]);
- }
- }
- }
-
- $errors = form_get_errors() != FALSE ? form_get_errors() : array();
- $destination = drupal_get_destination();
- $row_position = 0;
- // Build the actual form.
- $form['terms'] = array(
- '#type' => 'table',
- '#header' => array(t('Name'), t('Weight'), t('Operations')),
- '#empty' => t('No terms available. Add term.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->id() . '/add'))),
- '#attributes' => array(
- 'id' => 'taxonomy',
- ),
- );
- foreach ($current_page as $key => $term) {
- // Save the term for the current page so we don't have to load it a second
- // time.
- $form['terms'][$key]['#term'] = (array) $term;
- if (isset($term->parents)) {
- $form['terms'][$key]['#term']['parent'] = $term->parent = $term->parents[0];
- unset($form['terms'][$key]['#term']['parents'], $term->parents);
- }
-
- $form['terms'][$key]['term'] = array(
- '#prefix' => isset($term->depth) && $term->depth > 0 ? theme('indentation', array('size' => $term->depth)) : '',
- '#type' => 'link',
- '#title' => $term->label(),
- '#href' => "taxonomy/term/$term->tid",
- );
- if ($vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
- $parent_fields = TRUE;
- $form['terms'][$key]['term']['tid'] = array(
- '#type' => 'hidden',
- '#value' => $term->tid,
- '#attributes' => array(
- 'class' => array('term-id'),
- ),
- );
- $form['terms'][$key]['term']['parent'] = array(
- '#type' => 'hidden',
- // Yes, default_value on a hidden. It needs to be changeable by the
- // javascript.
- '#default_value' => $term->parent,
- '#attributes' => array(
- 'class' => array('term-parent'),
- ),
- );
- $form['terms'][$key]['term']['depth'] = array(
- '#type' => 'hidden',
- // Same as above, the depth is modified by javascript, so it's a
- // default_value.
- '#default_value' => $term->depth,
- '#attributes' => array(
- 'class' => array('term-depth'),
- ),
- );
- }
- $form['terms'][$key]['weight'] = array(
- '#type' => 'weight',
- '#delta' => $delta,
- '#title_display' => 'invisible',
- '#title' => t('Weight for added term'),
- '#default_value' => $term->weight,
- '#attributes' => array(
- 'class' => array('term-weight'),
- ),
- );
- $operations = array(
- 'edit' => array(
- 'title' => t('edit'),
- 'href' => 'taxonomy/term/' . $term->tid . '/edit',
- 'query' => $destination,
- ),
- 'delete' => array(
- 'title' => t('delete'),
- 'href' => 'taxonomy/term/' . $term->tid . '/delete',
- 'query' => $destination,
- ),
- );
- if (module_invoke('translation_entity', 'translate_access', $term)) {
- $operations['translate'] = array(
- 'title' => t('translate'),
- 'href' => 'taxonomy/term/' . $term->tid . '/translations',
- 'query' => $destination,
- );
- }
- $form['terms'][$key]['operations'] = array(
- '#type' => 'operations',
- '#links' => $operations,
- );
-
- $form['terms'][$key]['#attributes']['class'] = array();
- if ($parent_fields) {
- $form['terms'][$key]['#attributes']['class'][] = 'draggable';
- }
-
- // Add classes that mark which terms belong to previous and next pages.
- if ($row_position < $back_step || $row_position >= $page_entries - $forward_step) {
- $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-preview';
- }
-
- if ($row_position !== 0 && $row_position !== count($tree) - 1) {
- if ($row_position == $back_step - 1 || $row_position == $page_entries - $forward_step - 1) {
- $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-top';
- }
- elseif ($row_position == $back_step || $row_position == $page_entries - $forward_step) {
- $form['terms'][$key]['#attributes']['class'][] = 'taxonomy-term-divider-bottom';
- }
- }
-
- // Add an error class if this row contains a form error.
- foreach ($errors as $error_key => $error) {
- if (strpos($error_key, $key) === 0) {
- $form['terms'][$key]['#attributes']['class'][] = 'error';
- }
- }
- $row_position++;
- }
-
-
- if ($parent_fields) {
- $form['terms']['#tabledrag'][] = array('match', 'parent', 'term-parent', 'term-parent', 'term-id', FALSE);
- $form['terms']['#tabledrag'][] = array('depth', 'group', 'term-depth', NULL, NULL, FALSE);
- $form['terms']['#attached']['library'][] = array('taxonomy', 'drupal.taxonomy');
- $form['terms']['#attached']['js'][] = array(
- 'data' => array('taxonomy' => array('backStep' => $back_step, 'forwardStep' => $forward_step)),
- 'type' => 'setting',
- );
- }
- $form['terms']['#tabledrag'][] = array('order', 'sibling', 'term-weight');
-
- if ($vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
- $form['actions'] = array('#type' => 'actions', '#tree' => FALSE);
- $form['actions']['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save'),
- '#button_type' => 'primary',
- );
- $form['actions']['reset_alphabetical'] = array(
- '#type' => 'submit',
- '#value' => t('Reset to alphabetical')
- );
- $form_state['redirect'] = array(current_path(), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
- }
-
- return $form;
-}
-
-/**
* Submit handler for terms overview form.
*
* Rather than using a textfield or weight field, this form depends entirely
@@ -389,106 +118,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
* @see taxonomy_overview_terms()
*/
function taxonomy_overview_terms_submit($form, &$form_state) {
- if ($form_state['triggering_element']['#value'] == t('Reset to alphabetical')) {
- // Execute the reset action.
- if ($form_state['values']['reset_alphabetical'] === TRUE) {
- return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state);
- }
- // Rebuild the form to confirm the reset action.
- $form_state['rebuild'] = TRUE;
- $form_state['confirm_reset_alphabetical'] = TRUE;
- return;
- }
-
- // Sort term order based on weight.
- uasort($form_state['values']['terms'], 'drupal_sort_weight');
-
- $vocabulary = $form_state['taxonomy']['vocabulary'];
- // Update the current hierarchy type as we go.
- $hierarchy = TAXONOMY_HIERARCHY_DISABLED;
-
- $changed_terms = array();
- $tree = taxonomy_get_tree($vocabulary->id());
-
- if (empty($tree)) {
- return;
- }
-
- // Build a list of all terms that need to be updated on previous pages.
- $weight = 0;
- $term = (array) $tree[0];
- while ($term['tid'] != $form['#first_tid']) {
- if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
- $term['parent'] = $term['parents'][0];
- $term['weight'] = $weight;
- $changed_terms[$term['tid']] = $term;
- }
- $weight++;
- $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
- $term = (array) $tree[$weight];
- }
-
- // Renumber the current page weights and assign any new parents.
- $level_weights = array();
- foreach ($form_state['values']['terms'] as $tid => $values) {
- if (isset($form['terms'][$tid]['#term'])) {
- $term = $form['terms'][$tid]['#term'];
- // Give terms at the root level a weight in sequence with terms on previous pages.
- if ($values['term']['parent'] == 0 && $term['weight'] != $weight) {
- $term['weight'] = $weight;
- $changed_terms[$term['tid']] = $term;
- }
- // Terms not at the root level can safely start from 0 because they're all on this page.
- elseif ($values['term']['parent'] > 0) {
- $level_weights[$values['term']['parent']] = isset($level_weights[$values['term']['parent']]) ? $level_weights[$values['term']['parent']] + 1 : 0;
- if ($level_weights[$values['term']['parent']] != $term['weight']) {
- $term['weight'] = $level_weights[$values['term']['parent']];
- $changed_terms[$term['tid']] = $term;
- }
- }
- // Update any changed parents.
- if ($values['term']['parent'] != $term['parent']) {
- $term['parent'] = $values['term']['parent'];
- $changed_terms[$term['tid']] = $term;
- }
- $hierarchy = $term['parent'] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
- $weight++;
- }
- }
-
- // Build a list of all terms that need to be updated on following pages.
- for ($weight; $weight < count($tree); $weight++) {
- $term = (array) $tree[$weight];
- if ($term['parents'][0] == 0 && $term['weight'] != $weight) {
- $term['parent'] = $term['parents'][0];
- $term['weight'] = $weight;
- $changed_terms[$term['tid']] = $term;
- }
- $hierarchy = $term['parents'][0] != 0 ? TAXONOMY_HIERARCHY_SINGLE : $hierarchy;
- }
-
- // Save all updated terms.
- foreach ($changed_terms as $changed) {
- $term = (object) $changed;
- // Update term_hierachy and term_data directly since we don't have a
- // fully populated term object to save.
- db_update('taxonomy_term_hierarchy')
- ->fields(array('parent' => $term->parent))
- ->condition('tid', $term->tid, '=')
- ->execute();
-
- db_update('taxonomy_term_data')
- ->fields(array('weight' => $term->weight))
- ->condition('tid', $term->tid, '=')
- ->execute();
- }
-
- // Update the vocabulary hierarchy to flat or single hierarchy.
- if ($vocabulary->hierarchy != $hierarchy) {
- $vocabulary->hierarchy = $hierarchy;
- taxonomy_vocabulary_save($vocabulary);
- }
- drupal_set_message(t('The configuration options have been saved.'));
+
}
/**
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 89f334b..04e3330 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -329,11 +329,6 @@ function taxonomy_menu() {
$items['admin/structure/taxonomy/%taxonomy_vocabulary'] = array(
'title callback' => 'entity_page_label',
'title arguments' => array(3),
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('taxonomy_overview_terms', 3),
- 'access callback' => 'entity_page_access',
- 'access arguments' => array(3, 'view'),
- 'file' => 'taxonomy.admin.inc',
);
$items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array(
'title' => 'List',
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
index e69de29..017e51e 100644
--- a/core/modules/taxonomy/taxonomy.routing.yml
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -0,0 +1,6 @@
+taxonomy_overview_terms:
+ pattern: admin/structure/taxonomy/{%taxonomy_vocabulary}
+ defaults:
+ _form: 'Drupal\taxonomy\Form\OverviewTerms'
+ requirements:
+ _entity_access: 'taxonomy_vocabulary.view'