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

Issue #2312647 by iMiksu, olli, longwave, Jalandhar: views_ajax_render() has been removed

8.0.x
Alex Pott 2015-02-27 12:43:19 +00:00
parent 268c4f209e
commit ca35085f8a
8 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/views_ui/src/Form/Ajax/AddHandler.php
View File

@ -62,7 +62,10 @@ class AddHandler extends ViewsFormBase {
);
$executable = $view->getExecutable();
$executable->setDisplay($display_id);
if (!$executable->setDisplay($display_id)) {
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$display = &$executable->displayHandlers->get($display_id);
$types = ViewExecutable::getHandlerTypes();

5
core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
View File

@ -69,7 +69,10 @@ class ConfigHandler extends ViewsFormBase {
);
$executable = $view->getExecutable();
$save_ui_cache = FALSE;
$executable->setDisplay($display_id);
if (!$executable->setDisplay($display_id)) {
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$item = $executable->getHandler($display_id, $type, $id);
if ($item) {

5
core/modules/views_ui/src/Form/Ajax/ConfigHandlerExtra.php
View File

@ -64,7 +64,10 @@ class ConfigHandlerExtra extends ViewsFormBase {
),
);
$executable = $view->getExecutable();
$executable->setDisplay($display_id);
if (!$executable->setDisplay($display_id)) {
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$item = $executable->getHandler($display_id, $type, $id);
if ($item) {

3
core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
View File

@ -66,7 +66,8 @@ class ConfigHandlerGroup extends ViewsFormBase {
);
$executable = $view->getExecutable();
if (!$executable->setDisplay($display_id)) {
views_ajax_render($this->t('Invalid display id @display', array('@display' => $display_id)));
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$executable->initQuery();

5
core/modules/views_ui/src/Form/Ajax/Display.php
View File

@ -64,7 +64,10 @@ class Display extends ViewsFormBase {
$display_id = $form_state->get('display_id');
$executable = $view->getExecutable();
$executable->setDisplay($display_id);
if (!$executable->setDisplay($display_id)) {
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
// Get form from the handler.
$form['options'] = array(

5
core/modules/views_ui/src/Form/Ajax/Rearrange.php
View File

@ -56,7 +56,10 @@ class Rearrange extends ViewsFormBase {
$types = ViewExecutable::getHandlerTypes();
$executable = $view->getExecutable();
$executable->setDisplay($display_id);
if (!$executable->setDisplay($display_id)) {
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$display = &$executable->displayHandlers->get($display_id);
$form['#title'] = $this->t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';

3
core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
View File

@ -42,7 +42,8 @@ class RearrangeFilter extends ViewsFormBase {
$types = ViewExecutable::getHandlerTypes();
$executable = $view->getExecutable();
if (!$executable->setDisplay($display_id)) {
views_ajax_render($this->t('Invalid display id @display', array('@display' => $display_id)));
$form['markup'] = array('#markup' => $this->t('Invalid display id @display', array('@display' => $display_id)));
return $form;
}
$display = $executable->displayHandlers->get($display_id);
$form['#title'] = String::checkPlain($display->display['display_title']) . ': ';

4
core/modules/views_ui/src/Tests/ViewEditTest.php
View File

@ -70,6 +70,10 @@ class ViewEditTest extends UITestBase {
$machine_name_edit_url = 'admin/structure/views/nojs/display/test_view/test_1/display_id';
$error_text = t('Display name must be letters, numbers, or underscores only.');
// Test that potential invalid display ID requests are detected
$this->drupalGet('admin/structure/views/ajax/handler/test_view/fake_display_name/filter/title');
$this->assertText('Invalid display id fake_display_name');
$edit = array('display_id' => 'test 1');
$this->drupalPostForm($machine_name_edit_url, $edit, 'Apply');
$this->assertText($error_text);