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

Issue #1832872 follow-up by dawehner: Fixed broken Views UI search box/filtering.

8.0.x
webchick 2013-01-22 17:23:19 -08:00
parent 3e9ae8f156
commit 26fe08d8fb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/modules/views/views_ui/admin.inc
View File

@ -418,9 +418,16 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
$displays = $executable->displayHandlers; $displays = $executable->displayHandlers;
$current_display = $executable->display_handler; $current_display = $executable->display_handler;
// Add the "2 of 3" progress indicator. // @todo Move this to a separate function if it's needed on any forms that
// @TODO: Move this to a separate function if it's needed on any forms that
// don't have the display dropdown. // don't have the display dropdown.
$form['override'] = array(
'#prefix' => '<div class="views-override clearfix container-inline">',
'#suffix' => '</div>',
'#weight' => -1000,
'#tree' => TRUE,
);
// Add the "2 of 3" progress indicator.
if ($form_progress = $view->getFormProgress()) { if ($form_progress = $view->getFormProgress()) {
$form['progress']['#markup'] = '<div id="views-progress-indicator">' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '</div>'; $form['progress']['#markup'] = '<div id="views-progress-indicator">' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '</div>';
$form['progress']['#weight'] = -1001; $form['progress']['#weight'] = -1001;
@ -449,12 +456,6 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
$display_dropdown['default_revert'] = t('Revert to default'); $display_dropdown['default_revert'] = t('Revert to default');
} }
$form['override'] = array(
'#prefix' => '<div class="views-override clearfix container-inline">',
'#suffix' => '</div>',
'#weight' => -1000,
'#tree' => TRUE,
);
$form['override']['dropdown'] = array( $form['override']['dropdown'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('For'), // @TODO: Translators may need more context than this. '#title' => t('For'), // @TODO: Translators may need more context than this.
@ -1216,7 +1217,6 @@ function views_ui_add_item_form($form, &$form_state) {
$type = $form_state['type']; $type = $form_state['type'];
$form = array( $form = array(
'override' => array(),
'options' => array( 'options' => array(
'#theme_wrappers' => array('container'), '#theme_wrappers' => array('container'),
'#attributes' => array('class' => array('scroll')), '#attributes' => array('class' => array('scroll')),

2
core/modules/views/views_ui/js/views-admin.js
View File

@ -345,7 +345,7 @@ Drupal.viewsUi.OptionsSearch = function ($form) {
this.$form = $form; this.$form = $form;
// Add a keyup handler to the search box. // Add a keyup handler to the search box.
this.$searchBox = this.$form.find('#edit-options-search'); this.$searchBox = this.$form.find('#edit-override-controls-options-search');
this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this)); this.$searchBox.keyup(jQuery.proxy(this.handleKeyup, this));
// Get a list of option labels and their corresponding divs and maintain it // Get a list of option labels and their corresponding divs and maintain it
// in memory, so we have as little overhead as possible at keyup time. // in memory, so we have as little overhead as possible at keyup time.