commit a598f5eefbd12405f3b611901acd21b873c90357 Author: Joel Pittet Date: Fri Mar 15 03:35:54 2013 -0700 filter-type-table-1938904-3.patch diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc index 82fcde8..f147766 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -237,13 +237,19 @@ function filter_admin_format_form($form, &$form_state, $format) { // Filter order (tabledrag). $form['filters']['order'] = array( '#type' => 'table', + // For filter.admin.js + '#attributes' => array('id' => 'filter-order'), '#title' => t('Filter processing order'), '#tabledrag' => array( array('order', 'sibling', 'filter-order-weight'), ), + '#tree' => FALSE, + '#input' => FALSE, + '#theme_wrappers' => array('form_element'), ); foreach ($filter_info as $name => $filter) { $form['filters']['order'][$name]['#attributes']['class'][] = 'draggable'; + $form['filters']['order'][$name]['#weight'] = $filters[$name]->weight; $form['filters']['order'][$name]['filter'] = array( '#markup' => $filter['title'], ); @@ -256,7 +262,6 @@ function filter_admin_format_form($form, &$form_state, $format) { '#parents' => array('filters', $name, 'weight'), '#attributes' => array('class' => array('filter-order-weight')), ); - $form['filters']['order'][$name]['#weight'] = $filters[$name]->weight; } // Filter settings. diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js index 123576a..f55159a 100644 --- a/core/modules/filter/filter.admin.js +++ b/core/modules/filter/filter.admin.js @@ -33,7 +33,7 @@ Drupal.behaviors.filterStatus = { } } // Restripe table after toggling visibility of table row. - Drupal.tableDrag['edit-filters-order'].restripeTable(); + Drupal.tableDrag['filter-order'].restripeTable(); }); // Attach summary for configurable filters (only for screen-readers).