summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2014-01-22 00:50:13 -0800
committerwebchick2014-01-22 00:50:13 -0800
commit9e4cdb98115508900b77cdd392f15215f839dac6 (patch)
tree6bd393e4c37ae75687af44e940b57c32dd9d105e
parent4fbb1a1be58f01c54611f368cd4df29dac10bcbf (diff)
Issue #2143495 by dawehner, derhasi: Improve naming of ViewExecutable::addItem(), ::getItem() & Co.8.0-alpha8
-rw-r--r--core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php4
-rw-r--r--core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php2
-rw-r--r--core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php4
-rw-r--r--core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php4
-rw-r--r--core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php2
-rw-r--r--core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php2
-rw-r--r--core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php2
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php2
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php4
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php10
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php4
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php4
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php2
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php2
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php10
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php4
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php12
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php6
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php22
-rw-r--r--core/modules/views/lib/Drupal/views/ViewExecutable.php20
-rw-r--r--core/modules/views_ui/js/views-admin.js20
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php2
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddHandler.php (renamed from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php)14
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandler.php (renamed from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php)16
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerExtra.php (renamed from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php)12
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerGroup.php (renamed from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php)14
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php4
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php2
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php18
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php8
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php4
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php2
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php18
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php10
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php16
-rw-r--r--core/modules/views_ui/views_ui.module4
-rw-r--r--core/modules/views_ui/views_ui.routing.yml24
37 files changed, 155 insertions, 155 deletions
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
index 9132d5a..abe0e4e 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
@@ -32,7 +32,7 @@ class FilterUserUIDTest extends CommentTestBase {
function testCommentUserUIDTest() {
$view = views_get_view('test_comment_user_uid');
$view->setDisplay();
- $view->removeItem('default', 'argument', 'uid_touch');
+ $view->removeHandler('default', 'argument', 'uid_touch');
$options = array(
'id' => 'uid_touch',
@@ -40,7 +40,7 @@ class FilterUserUIDTest extends CommentTestBase {
'field' => 'uid_touch',
'value' => array($this->loggedInUser->id()),
);
- $view->addItem('default', 'filter', 'node_field_data', 'uid_touch', $options);
+ $view->addHandler('default', 'filter', 'node_field_data', 'uid_touch', $options);
$this->executeView($view, array($this->account->id()));
$result_set = array(
array(
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
index 7ee45e6..0059b32 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
@@ -51,7 +51,7 @@ class EntityReference extends Fields {
public function preRender($row) {
// Force all fields to be inline by default.
if (empty($this->options['inline'])) {
- $fields = $this->view->getItems('field', $this->displayHandler->display['id']);
+ $fields = $this->view->getHandlers('field', $this->displayHandler->display['id']);
$this->options['inline'] = drupal_map_assoc(array_keys($fields));
}
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
index 5748227..07507fe 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
@@ -63,7 +63,7 @@ class FieldUITest extends FieldTestBase {
* Tests basic field handler settings in the UI.
*/
public function testHandlerUI() {
- $url = "admin/structure/views/nojs/config-item/test_view_fieldapi/default/field/field_name_0";
+ $url = "admin/structure/views/nojs/handler/test_view_fieldapi/default/field/field_name_0";
$this->drupalGet($url);
// Tests the available formatter options.
@@ -101,7 +101,7 @@ class FieldUITest extends FieldTestBase {
$edit = array('group_by' => '1');
$this->drupalPostForm('admin/structure/views/nojs/display/test_view_fieldapi/default/group_by', $edit, t('Apply'));
- $url = "admin/structure/views/nojs/config-item/test_view_fieldapi/default/field/field_name_0";
+ $url = "admin/structure/views/nojs/handler/test_view_fieldapi/default/field/field_name_0";
$this->drupalGet($url);
$this->assertResponse(200);
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php
index 6b59ca6..2de6522 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php
@@ -76,7 +76,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
}
}
- $this->drupalGet('admin/structure/views/nojs/config-item/test_filter_taxonomy_index_tid/default/filter/tid');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid');
$result = $this->xpath('//select[@id="edit-options-value"]/option');
@@ -100,7 +100,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
$display =& $view->getDisplay('default');
$display['display_options']['filters']['tid']['type'] = 'textfield';
$view->save();
- $this->drupalGet('admin/structure/views/nojs/config-item/test_filter_taxonomy_index_tid/default/filter/tid');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid');
$result = $this->xpath('//input[@id="edit-options-value"]/@data-autocomplete-path');
$this->assertEqual((string) $result[0], url('taxonomy/autocomplete_vid/tags'));
}
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
index 54a689b..9917cad 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
@@ -60,7 +60,7 @@ class TrackerUserUidTest extends TrackerTestBase {
$view->destroy();
// Remove the filter now, so only the argument will affect the query.
- $view->removeItem('default', 'filter', 'uid_touch_tracker');
+ $view->removeHandler('default', 'filter', 'uid_touch_tracker');
// Test the incorrect argument UID.
$view->initHandlers();
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
index e6cb0c4..af8e58d 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
@@ -82,7 +82,7 @@ class BulkFormTest extends UserTestBase {
// Remove the user status filter from the view.
$view = views_get_view('test_user_bulk_form');
- $view->removeItem('default', 'filter', 'status');
+ $view->removeHandler('default', 'filter', 'status');
$view->storage->save();
// Ensure the anonymous user is found.
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
index 1f44b70..f4eefdd 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
@@ -98,7 +98,7 @@ class HandlerFilterUserNameTest extends ViewTestBase {
$admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
$this->drupalLogin($admin_user);
- $path = 'admin/structure/views/nojs/config-item/test_user_name/default/filter/uid';
+ $path = 'admin/structure/views/nojs/handler/test_user_name/default/filter/uid';
$this->drupalGet($path);
// Pass in an invalid username, the validation should catch it.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index 9590e1c..1b8c4ce 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -852,7 +852,7 @@ abstract class HandlerBase extends PluginBase {
$this->defaultExposeOptions();
}
- $form_state['view']->getExecutable()->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
+ $form_state['view']->getExecutable()->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
$form_state['view']->addFormToStack($form_state['form_key'], $form_state['display_id'], $form_state['type'], $form_state['id'], TRUE, TRUE);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 4a18171..0622d86 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -426,7 +426,7 @@ abstract class FilterPluginBase extends HandlerBase {
$this->buildGroupOptions();
}
- $form_state['view']->getExecutable()->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
+ $form_state['view']->getExecutable()->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
$form_state['view']->addFormToStack($form_state['form_key'], $form_state['display_id'], $form_state['type'], $form_state['id'], TRUE, TRUE);
@@ -1089,7 +1089,7 @@ abstract class FilterPluginBase extends HandlerBase {
// Add a new row.
$item['group_info']['group_items'][] = array();
- $form_state['view']->getExecutable()->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
+ $form_state['view']->getExecutable()->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
$form_state['view']->cacheSet();
$form_state['rerender'] = TRUE;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index 06d4d03..3a1597d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -205,7 +205,7 @@ class GroupwiseMax extends RelationshipPluginBase {
$sort = $options['subquery_sort'];
list($sort_table, $sort_field) = explode('.', $sort);
$sort_options = array('order' => $options['subquery_order']);
- $temp_view->addItem('default', 'sort', $sort_table, $sort_field, $sort_options);
+ $temp_view->addHandler('default', 'sort', $sort_table, $sort_field, $sort_options);
}
// Get the namespace string.
@@ -217,20 +217,20 @@ class GroupwiseMax extends RelationshipPluginBase {
$temp_view->args[] = '**CORRELATED**';
// Add the base table ID field.
- $temp_view->addItem('default', 'field', $this->definition['base'], $this->definition['field']);
+ $temp_view->addHandler('default', 'field', $this->definition['base'], $this->definition['field']);
$relationship_id = NULL;
// Add the used relationship for the subjoin, if defined.
if (isset($this->definition['relationship'])) {
list($relationship_table, $relationship_field) = explode(':', $this->definition['relationship']);
- $relationship_id = $temp_view->addItem('default', 'relationship', $relationship_table, $relationship_field);
+ $relationship_id = $temp_view->addHandler('default', 'relationship', $relationship_table, $relationship_field);
}
$temp_item_options = array('relationship' => $relationship_id);
// Add the correct argument for our relationship's base
// ie the 'how to get back to base' argument.
// The relationship definition tells us which one to use.
- $temp_view->addItem('default', 'argument', $this->definition['argument table'], $this->definition['argument field'], $temp_item_options);
+ $temp_view->addHandler('default', 'argument', $this->definition['argument table'], $this->definition['argument field'], $temp_item_options);
// Build the view. The creates the query object and produces the query
// string but does not run any queries.
@@ -269,7 +269,7 @@ class GroupwiseMax extends RelationshipPluginBase {
$where = &$subquery->conditions();
$this->alterSubqueryCondition($subquery, $where);
// Not sure why, but our sort order clause doesn't have a table.
- // TODO: the call to add_item() above to add the sort handler is probably
+ // TODO: the call to addHandler() above to add the sort handler is probably
// wrong -- needs attention from someone who understands it.
// In the meantime, this works, but with a leap of faith...
$orders = &$subquery->getOrderBy();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
index a444593..ef0a8c7 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
@@ -103,9 +103,9 @@ class AreaEntityTest extends ViewTestBase {
// Change the view mode of the area handler.
$view = views_get_view('test_entity_area');
- $item = $view->getItem('default', 'header', 'entity_entity_test');
+ $item = $view->getHandler('default', 'header', 'entity_entity_test');
$item['view_mode'] = 'test';
- $view->setItem('default', 'header', 'entity_entity_test', $item);
+ $view->setHandler('default', 'header', 'entity_entity_test', $item);
$preview = $view->preview('default', array($entities[1]->id()));
$this->drupalSetContent(drupal_render($preview));
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
index 78f7934..7b0368e 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
@@ -67,7 +67,7 @@ class AreaTest extends HandlerTestBase {
$types = array('header', 'footer', 'empty');
$labels = array();
foreach ($types as $type) {
- $edit_path = 'admin/structure/views/nojs/config-item/test_example_area/default/' . $type .'/test_example';
+ $edit_path = 'admin/structure/views/nojs/handler/test_example_area/default/' . $type .'/test_example';
// First setup an empty label.
$this->drupalPostForm($edit_path, array(), t('Apply'));
@@ -127,7 +127,7 @@ class AreaTest extends HandlerTestBase {
$view = views_get_view('test_example_area');
$view->initHandlers();
- $this->drupalGet('admin/structure/views/nojs/config-item/test_example_area/default/empty/test_example');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_example_area/default/empty/test_example');
// Test that the list is token present.
$element = $this->xpath('//ul[@class="global-tokens"]');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 72b7b21..e73a5b6 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -153,7 +153,7 @@ class FilterDateTest extends HandlerTestBase {
$this->drupalLogin($this->drupalCreateUser(array('administer views', 'administer site configuration')));
menu_router_rebuild();
$this->drupalGet('admin/structure/views/view/test_filter_date_between/edit');
- $this->drupalGet('admin/structure/views/nojs/config-item/test_filter_date_between/default/filter/created');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_filter_date_between/default/filter/created');
$edit = array();
// Generate a definitive wrong value, which should be checked by validation.
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
index 7808e0c..5f73592 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
@@ -85,7 +85,7 @@ class HandlerAllTest extends HandlerTestBase {
$options['value'] = array(1);
}
}
- $view->addItem('default', $type, $base_table, $field, $options);
+ $view->addHandler('default', $type, $base_table, $field, $options);
}
}
}
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
index 91d9654..d4f7ba6 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
@@ -78,7 +78,7 @@ class HandlerTest extends ViewTestBase {
$this->drupalLogin($admin_user);
menu_router_rebuild();
- $path = 'admin/structure/views/nojs/config-item/test_filter_in_operator_ui/default/filter/type';
+ $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
$this->drupalGet($path);
$this->assertFieldByName('options[expose][reduce]', FALSE);
@@ -244,7 +244,7 @@ class HandlerTest extends ViewTestBase {
$this->drupalLogin($views_admin);
// Make sure the link to the field options exists.
- $handler_options_path = 'admin/structure/views/nojs/config-item/test_handler_relationships/default/field/title';
+ $handler_options_path = 'admin/structure/views/nojs/handler/test_handler_relationships/default/field/title';
$view_edit_path = 'admin/structure/views/view/test_handler_relationships/edit';
$this->drupalGet($view_edit_path);
$this->assertLinkByHref($handler_options_path);
@@ -270,7 +270,7 @@ class HandlerTest extends ViewTestBase {
$this->assertEqual($options, $expected_options);
// Remove the relationship and make sure no relationship option appears.
- $this->drupalPostForm('admin/structure/views/nojs/config-item/test_handler_relationships/default/relationship/nid', array(), t('Remove'));
+ $this->drupalPostForm('admin/structure/views/nojs/handler/test_handler_relationships/default/relationship/nid', array(), t('Remove'));
$this->drupalGet($handler_options_path);
$this->assertNoFieldByName($relationship_name, 'Make sure that no relationship option is available');
}
@@ -282,9 +282,9 @@ class HandlerTest extends ViewTestBase {
$view = views_get_view('test_handler_relationships');
$view->setDisplay();
// Setup a broken relationship.
- $view->addItem('default', 'relationship', $this->randomName(), $this->randomName(), array(), 'broken_relationship');
+ $view->addHandler('default', 'relationship', $this->randomName(), $this->randomName(), array(), 'broken_relationship');
// Setup a valid relationship.
- $view->addItem('default', 'relationship', 'comment', 'node', array('relationship' => 'cid'), 'valid_relationship');
+ $view->addHandler('default', 'relationship', 'comment', 'node', array('relationship' => 'cid'), 'valid_relationship');
$view->initHandlers();
$field = $view->field['title'];
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
index cf81e2e..ced33c2 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -59,7 +59,7 @@ class ArgumentDefaultTest extends PluginTestBase {
),
'default_action' => 'default'
);
- $id = $view->addItem('default', 'argument', 'views_test_data', 'name', $options);
+ $id = $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
$view->initHandlers();
$plugin = $view->argument[$id]->getPlugin('argument_default');
$this->assertTrue($plugin instanceof ArgumentDefaultTestPlugin, 'The correct argument default plugin is used.');
@@ -94,7 +94,7 @@ class ArgumentDefaultTest extends PluginTestBase {
$edit = array(
'options[default_argument_type]' => $argument_type,
);
- $this->drupalPostForm('admin/structure/views/nojs/config-item/test_argument_default_current_user/default/argument/uid', $edit, t('Apply'));
+ $this->drupalPostForm('admin/structure/views/nojs/handler/test_argument_default_current_user/default/argument/uid', $edit, t('Apply'));
// Note, the undefined index error has two spaces after it.
$error = array(
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index 0ea9565..ae96609 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -297,26 +297,26 @@ class DisplayTest extends PluginTestBase {
'id' => 'id',
'value' => array('value' => 7297)
);
- $view->setItem('default', 'filter', 'id', $item);
+ $view->setHandler('default', 'filter', 'id', $item);
$this->executeView($view);
$this->assertFalse(count($view->result), 'Ensure the result of the view is empty.');
$this->assertFalse($view->display_handler->outputIsEmpty(), 'Ensure the view output is marked as not empty, because the empty text still appears.');
$view->destroy();
// Remove the empty area, but mark the header area to still appear.
- $view->removeItem('default', 'empty', 'area');
- $item = $view->getItem('default', 'header', 'area');
+ $view->removeHandler('default', 'empty', 'area');
+ $item = $view->getHandler('default', 'header', 'area');
$item['empty'] = TRUE;
- $view->setItem('default', 'header', 'area', $item);
+ $view->setHandler('default', 'header', 'area', $item);
$this->executeView($view);
$this->assertFalse(count($view->result), 'Ensure the result of the view is empty.');
$this->assertFalse($view->display_handler->outputIsEmpty(), 'Ensure the view output is marked as not empty, because the header text still appears.');
$view->destroy();
// Hide the header on empty results.
- $item = $view->getItem('default', 'header', 'area');
+ $item = $view->getHandler('default', 'header', 'area');
$item['empty'] = FALSE;
- $view->setItem('default', 'header', 'area', $item);
+ $view->setHandler('default', 'header', 'area', $item);
$this->executeView($view);
$this->assertFalse(count($view->result), 'Ensure the result of the view is empty.');
$this->assertTrue($view->display_handler->outputIsEmpty(), 'Ensure the view output is marked as empty.');
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
index 9ac028e..3d06758 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
@@ -308,10 +308,10 @@ class ViewExecutableTest extends ViewUnitTestBase {
$view->setResponse($new_response);
$this->assertIdentical(spl_object_hash($view->getResponse()), spl_object_hash($new_response), 'New response object correctly set.');
- // Test the generateItemId() method.
+ // Test the generateHandlerId() method.
$test_ids = drupal_map_assoc(array('test', 'test_1'));
- $this->assertEqual($view->generateItemId('new', $test_ids), 'new');
- $this->assertEqual($view->generateItemId('test', $test_ids), 'test_2');
+ $this->assertEqual($view->generateHandlerId('new', $test_ids), 'new');
+ $this->assertEqual($view->generateHandlerId('test', $test_ids), 'test_2');
// Test the getPath() method.
$path = $this->randomName();
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index 4fc2f5c..44955a5 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -257,11 +257,11 @@ class ViewStorageTest extends ViewUnitTestBase {
$display_id = 'default';
$expected_items = array();
- // Tests addItem with getItem.
+ // Tests addHandler with getItem.
// Therefore add one item without any optioins and one item with some
// options.
- $id1 = $view->addItem($display_id, 'field', 'views_test_data', 'id');
- $item1 = $view->getItem($display_id, 'field', 'id');
+ $id1 = $view->addHandler($display_id, 'field', 'views_test_data', 'id');
+ $item1 = $view->getHandler($display_id, 'field', 'id');
$expected_items[$id1] = $expected_item = array(
'id' => 'id',
'table' => 'views_test_data',
@@ -276,8 +276,8 @@ class ViewStorageTest extends ViewUnitTestBase {
'text' => $this->randomName()
)
);
- $id2 = $view->addItem($display_id, 'field', 'views_test_data', 'name', $options);
- $item2 = $view->getItem($display_id, 'field', 'name');
+ $id2 = $view->addHandler($display_id, 'field', 'views_test_data', 'name', $options);
+ $item2 = $view->getHandler($display_id, 'field', 'name');
$expected_items[$id2] = $expected_item = array(
'id' => 'name',
'table' => 'views_test_data',
@@ -288,7 +288,7 @@ class ViewStorageTest extends ViewUnitTestBase {
$this->assertEqual($item2, $expected_item);
// Tests the expected fields from the previous additions.
- $this->assertEqual($view->getItems('field', $display_id), $expected_items);
+ $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
// Alter an existing item via setItem and check the result via getItem
// and getItems.
@@ -298,14 +298,14 @@ class ViewStorageTest extends ViewUnitTestBase {
)
) + $item1;
$expected_items[$id1] = $item;
- $view->setItem($display_id, 'field', $id1, $item);
- $this->assertEqual($view->getItem($display_id, 'field', 'id'), $item);
- $this->assertEqual($view->getItems('field', $display_id), $expected_items);
+ $view->setHandler($display_id, 'field', $id1, $item);
+ $this->assertEqual($view->getHandler($display_id, 'field', 'id'), $item);
+ $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
// Test removeItem method.
unset($expected_items[$id2]);
- $view->removeItem($display_id, 'field', $id2);
- $this->assertEqual($view->getItems('field', $display_id), $expected_items);
+ $view->removeHandler($display_id, 'field', $id2);
+ $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
}
/**
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index c9b097a..09346d3 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -1958,14 +1958,14 @@ class ViewExecutable {
* @return string
* The unique ID for this handler instance.
*/
- public function addItem($display_id, $type, $table, $field, $options = array(), $id = NULL) {
+ public function addHandler($display_id, $type, $table, $field, $options = array(), $id = NULL) {
$types = $this::viewsHandlerTypes();
$this->setDisplay($display_id);
$fields = $this->displayHandlers->get($display_id)->getOption($types[$type]['plural']);
if (empty($id)) {
- $id = $this->generateItemId($field, $fields);
+ $id = $this->generateHandlerId($field, $fields);
}
// If the desired type is not found, use the original value directly.
@@ -2008,7 +2008,7 @@ class ViewExecutable {
* integer to make it unique, e.g., "{$requested_id}_1",
* "{$requested_id}_2", etc.
*/
- public static function generateItemId($requested_id, $existing_items) {
+ public static function generateHandlerId($requested_id, $existing_items) {
$count = 0;
$id = $requested_id;
while (!empty($existing_items[$id])) {
@@ -2029,7 +2029,7 @@ class ViewExecutable {
* @return array
* An array of handler instances of a given type for this display.
*/
- public function getItems($type, $display_id = NULL) {
+ public function getHandlers($type, $display_id = NULL) {
$this->setDisplay($display_id);
if (!isset($display_id)) {
@@ -2055,7 +2055,7 @@ class ViewExecutable {
* Either the handler instance's configuration, or NULL if the handler is
* not used on the display.
*/
- public function getItem($display_id, $type, $id) {
+ public function getHandler($display_id, $type, $id) {
// Get info about the types so we can get the right data.
$types = static::viewsHandlerTypes();
// Initialize the display
@@ -2081,7 +2081,7 @@ class ViewExecutable {
*
* @see set_item_option()
*/
- public function setItem($display_id, $type, $id, $item) {
+ public function setHandler($display_id, $type, $id, $item) {
// Get info about the types so we can get the right data.
$types = static::viewsHandlerTypes();
// Initialize the display.
@@ -2107,7 +2107,7 @@ class ViewExecutable {
* @param string $id
* The ID of the handler being removed.
*/
- public function removeItem($display_id, $type, $id) {
+ public function removeHandler($display_id, $type, $id) {
// Get info about the types so we can get the right data.
$types = static::viewsHandlerTypes();
// Initialize the display.
@@ -2142,10 +2142,10 @@ class ViewExecutable {
*
* @see set_item()
*/
- public function setItemOption($display_id, $type, $id, $option, $value) {
- $item = $this->getItem($display_id, $type, $id);
+ public function setHandlerOption($display_id, $type, $id, $option, $value) {
+ $item = $this->getHandler($display_id, $type, $id);
$item[$option] = $value;
- $this->setItem($display_id, $type, $id, $item);
+ $this->setHandler($display_id, $type, $id, $item);
}
/**
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 0f620bf..bb54d50 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -164,12 +164,12 @@ Drupal.behaviors.addItemForm = {
attach: function (context) {
var $context = $(context);
var $form = $context;
- // The add item form may have an id of views-ui-add-item-form--n.
- if (!$context.is('form[id^="views-ui-add-item-form"]')) {
- $form = $context.find('form[id^="views-ui-add-item-form"]');
+ // The add handler form may have an id of views-ui-add-handler-form--n.
+ if (!$context.is('form[id^="views-ui-add-handler-form"]')) {
+ $form = $context.find('form[id^="views-ui-add-handler-form"]');
}
- if ($form.once('views-ui-add-item-form').length) {
- // If we we have an unprocessed views-ui-add-item-form, let's instantiate.
+ if ($form.once('views-ui-add-handler-form').length) {
+ // If we we have an unprocessed views-ui-add-handler-form, let's instantiate.
new Drupal.viewsUi.AddItemForm($form);
}
}
@@ -285,9 +285,9 @@ Drupal.behaviors.viewsUiSearchOptions = {
attach: function (context) {
var $context = $(context);
var $form = $context;
- // The add item form may have an id of views-ui-add-item-form--n.
- if (!$context.is('form[id^="views-ui-add-item-form"]')) {
- $form = $context.find('form[id^="views-ui-add-item-form"]');
+ // The add handler form may have an id of views-ui-add-handler-form--n.
+ if (!$context.is('form[id^="views-ui-add-handler-form"]')) {
+ $form = $context.find('form[id^="views-ui-add-handler-form"]');
}
// Make sure we don't add more than one event handler to the same form.
if ($form.once('views-ui-filter-options').length) {
@@ -764,7 +764,7 @@ $.extend(Drupal.viewsUi.RearrangeFilterHandler.prototype, {
Drupal.behaviors.viewsFilterConfigSelectAll = {
attach: function (context) {
// Show the select all checkbox.
- $(context).find('#views-ui-config-item-form div.form-item-options-value-all').once('filterConfigSelectAll')
+ $(context).find('#views-ui-handler-form div.form-item-options-value-all').once('filterConfigSelectAll')
.show()
.find('input[type=checkbox]')
.on('click', function () {
@@ -775,7 +775,7 @@ Drupal.behaviors.viewsFilterConfigSelectAll = {
});
});
// Uncheck the select all checkbox if any of the others are unchecked.
- $('#views-ui-config-item-form').find('div.form-type-checkbox').not($('.form-item-options-value-all'))
+ $('#views-ui-handler-form').find('div.form-type-checkbox').not($('.form-item-options-value-all'))
.find('input[type=checkbox]')
.on('click', function () {
if ($(this).is('checked') === false) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
index 90c1d58..0ee468a 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
@@ -103,7 +103,7 @@ class ViewsUIController implements ContainerInjectionInterface {
foreach ($executable->displayHandlers as $display_id => $display) {
if ($executable->setDisplay($display_id)) {
foreach ($handler_types as $type => $info) {
- foreach ($executable->getItems($type, $display_id) as $item) {
+ foreach ($executable->getHandlers($type, $display_id) as $item) {
$table_data = $this->viewsData->get($item['table']);
if (isset($table_data[$item['field']]) && isset($table_data[$item['field']][$type])
&& $field_data = $table_data[$item['field']][$type]) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddHandler.php
index 891f383..a4bd43d 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddHandler.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views_ui\Form\Ajax\AddItem.
+ * Contains \Drupal\views_ui\Form\Ajax\AddHandler.
*/
namespace Drupal\views_ui\Form\Ajax;
@@ -14,10 +14,10 @@ use Drupal\views\Views;
/**
* Provides a form for adding an item in the Views UI.
*/
-class AddItem extends ViewsFormBase {
+class AddHandler extends ViewsFormBase {
/**
- * Constucts a new AddItem object.
+ * Constucts a new AddHandler object.
*/
public function __construct($type = NULL) {
$this->setType($type);
@@ -27,7 +27,7 @@ class AddItem extends ViewsFormBase {
* {@inheritdoc}
*/
public function getFormKey() {
- return 'add-item';
+ return 'add-handler';
}
/**
@@ -42,7 +42,7 @@ class AddItem extends ViewsFormBase {
* {@inheritdoc}
*/
public function getFormId() {
- return 'views_ui_add_item_form';
+ return 'views_ui_add_handler_form';
}
/**
@@ -73,7 +73,7 @@ class AddItem extends ViewsFormBase {
}
$form['#title'] = $this->t('Add @type', array('@type' => $ltitle));
- $form['#section'] = $display_id . 'add-item';
+ $form['#section'] = $display_id . 'add-handler';
// Add the display override dropdown.
views_ui_standard_display_dropdown($form, $form_state, $section);
@@ -171,7 +171,7 @@ class AddItem extends ViewsFormBase {
'data-drupal-views-offset' => 'bottom',
),
);
- $view->getStandardButtons($form, $form_state, 'views_ui_add_item_form', $this->t('Add and configure @types', array('@types' => $ltitle)));
+ $view->getStandardButtons($form, $form_state, 'views_ui_add_handler_form', $this->t('Add and configure @types', array('@types' => $ltitle)));
// Remove the default submit function.
$form['actions']['submit']['#submit'] = array_filter($form['actions']['submit']['#submit'], function($var) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandler.php
index b84ddb2..c82cd07 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandler.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views_ui\Form\Ajax\ConfigItem.
+ * Contains \Drupal\views_ui\Form\Ajax\ConfigHandler.
*/
namespace Drupal\views_ui\Form\Ajax;
@@ -14,10 +14,10 @@ use Drupal\views\Views;
/**
* Provides a form for configuring an item in the Views UI.
*/
-class ConfigItem extends ViewsFormBase {
+class ConfigHandler extends ViewsFormBase {
/**
- * Constucts a new ConfigItem object.
+ * Constucts a new ConfigHandler object.
*/
public function __construct($type = NULL, $id = NULL) {
$this->setType($type);
@@ -28,7 +28,7 @@ class ConfigItem extends ViewsFormBase {
* {@inheritdoc}
*/
public function getFormKey() {
- return 'config-item';
+ return 'handler';
}
/**
@@ -66,7 +66,7 @@ class ConfigItem extends ViewsFormBase {
$executable = $view->getExecutable();
$save_ui_cache = FALSE;
$executable->setDisplay($display_id);
- $item = $executable->getItem($display_id, $type, $id);
+ $item = $executable->getHandler($display_id, $type, $id);
if ($item) {
$handler = $executable->display_handler->getHandler($type, $id);
@@ -124,7 +124,7 @@ class ConfigItem extends ViewsFormBase {
$rel = key($relationship_options);
// We want this relationship option to get saved even if the user
// skips submitting the form.
- $executable->setItemOption($display_id, $type, $id, 'relationship', $rel);
+ $executable->setHandlerOption($display_id, $type, $id, 'relationship', $rel);
$save_ui_cache = TRUE;
}
@@ -239,7 +239,7 @@ class ConfigItem extends ViewsFormBase {
$handler->unpackOptions($handler->options, $options, NULL, FALSE);
// Store the item back on the view
- $executable->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $handler->options);
+ $executable->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $handler->options);
// Ensure any temporary options are removed.
if (isset($form_state['view']->temporary_options[$type][$form_state['id']])) {
@@ -262,7 +262,7 @@ class ConfigItem extends ViewsFormBase {
$display = &$executable->displayHandlers->get($form_state['display_id']);
$display->optionsOverride($form, $form_state);
}
- $executable->removeItem($form_state['display_id'], $form_state['type'], $form_state['id']);
+ $executable->removeHandler($form_state['display_id'], $form_state['type'], $form_state['id']);
// Write to cache
$form_state['view']->cacheSet();
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerExtra.php
index b36bb75..7f17178 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerExtra.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views_ui\Form\Ajax\ConfigItemExtra.
+ * Contains \Drupal\views_ui\Form\Ajax\ConfigHandlerExtra.
*/
namespace Drupal\views_ui\Form\Ajax;
@@ -13,10 +13,10 @@ use Drupal\views\ViewExecutable;
/**
* Provides a form for configuring extra information for a Views UI item.
*/
-class ConfigItemExtra extends ViewsFormBase {
+class ConfigHandlerExtra extends ViewsFormBase {
/**
- * Constucts a new ConfigItemExtra object.
+ * Constucts a new ConfigHandlerExtra object.
*/
public function __construct($type = NULL, $id = NULL) {
$this->setType($type);
@@ -27,7 +27,7 @@ class ConfigItemExtra extends ViewsFormBase {
* {@inheritdoc}
*/
public function getFormKey() {
- return 'config-item-extra';
+ return 'handler-extra';
}
/**
@@ -64,7 +64,7 @@ class ConfigItemExtra extends ViewsFormBase {
);
$executable = $view->getExecutable();
$executable->setDisplay($display_id);
- $item = $executable->getItem($display_id, $type, $id);
+ $item = $executable->getHandler($display_id, $type, $id);
if ($item) {
$handler = $executable->display_handler->getHandler($type, $id);
@@ -110,7 +110,7 @@ class ConfigItemExtra extends ViewsFormBase {
}
// Store the item back on the view
- $form_state['view']->getExecutable()->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
+ $form_state['view']->getExecutable()->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
// Write to cache
$form_state['view']->cacheSet();
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerGroup.php
index 2a208f4..d69a69e 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigHandlerGroup.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views_ui\Form\Ajax\ConfigItemGroup.
+ * Contains \Drupal\views_ui\Form\Ajax\ConfigHandlerGroup.
*/
namespace Drupal\views_ui\Form\Ajax;
@@ -12,12 +12,12 @@ use Drupal\views\ViewStorageInterface;
use Drupal\views\ViewExecutable;
/**
- * Provides a form for configuring grouping information for a Views UI item.
+ * Provides a form for configuring grouping information for a Views UI handler.
*/
-class ConfigItemGroup extends ViewsFormBase {
+class ConfigHandlerGroup extends ViewsFormBase {
/**
- * Constucts a new ConfigItemGroup object.
+ * Constucts a new ConfigHandlerGroup object.
*/
public function __construct($type = NULL, $id = NULL) {
$this->setType($type);
@@ -28,7 +28,7 @@ class ConfigItemGroup extends ViewsFormBase {
* {@inheritdoc}
*/
public function getFormKey() {
- return 'config-item-group';
+ return 'handler-group';
}
/**
@@ -70,7 +70,7 @@ class ConfigItemGroup extends ViewsFormBase {
$executable->initQuery();
- $item = $executable->getItem($display_id, $type, $id);
+ $item = $executable->getHandler($display_id, $type, $id);
if ($item) {
$handler = $executable->display_handler->getHandler($type, $id);
@@ -106,7 +106,7 @@ class ConfigItemGroup extends ViewsFormBase {
$handler->submitGroupByForm($form, $form_state);
// Store the item back on the view
- $executable->setItem($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
+ $executable->setHandler($form_state['display_id'], $form_state['type'], $form_state['id'], $item);
// Write to cache
$form_state['view']->cacheSet();
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
index ad134af..d109ea3 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
@@ -16,8 +16,8 @@ interface ViewsFormInterface extends FormInterface {
* Returns the key that represents this form.
*
* @return string
- * The form key used in the URL, e.g., the string 'add-item' in
- * 'admin/structure/views/%/add-item/%/%/%'.
+ * The form key used in the URL, e.g., the string 'add-handler' in
+ * 'admin/structure/views/%/add-handler/%/%/%'.
*/
public function getFormKey();
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
index ae17b19..75aed9d 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
@@ -96,7 +96,7 @@ class CustomBooleanTest extends UITestBase {
'options[type_custom_true]' => $values['true'],
'options[type_custom_false]' => $values['false'],
);
- $this->drupalPostForm('admin/structure/views/nojs/config-item/test_view/default/field/age', $options, 'Apply');
+ $this->drupalPostForm('admin/structure/views/nojs/handler/test_view/default/field/age', $options, 'Apply');
// Save the view.
$this->drupalPostForm('admin/structure/views/view/test_view', array(), 'Save');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
index 0df5845..f5aec90 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
@@ -46,7 +46,7 @@ class ExposedFormUITest extends UITestBase {
menu_router_rebuild();
$edit = array();
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
// Be sure that the button is called exposed.
$this->helperButtonHasLabel('edit-options-expose-button-button', t('Expose filter'));
@@ -58,7 +58,7 @@ class ExposedFormUITest extends UITestBase {
$this->assertFieldById('edit-options-value-article', '', 'Checkbox for Article exists');
// Click the Expose filter button.
- $this->drupalPostForm('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type', $edit, t('Expose filter'));
+ $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type', $edit, t('Expose filter'));
// Check the label of the expose button.
$this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide filter'));
// Check the label of the grouped exposed button
@@ -82,12 +82,12 @@ class ExposedFormUITest extends UITestBase {
$this->assertText(t('This identifier is not allowed.'));
// Now check the sort criteria.
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/sort/created');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/sort/created');
$this->helperButtonHasLabel('edit-options-expose-button-button', t('Expose sort'));
$this->assertNoFieldById('edit-options-expose-label', '', 'Make sure no label field is shown');
// Click the Grouped Filters button.
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
$this->drupalPostForm(NULL, array(), t('Grouped filters'));
// After click on 'Grouped Filters', the standard operator and value should
@@ -102,7 +102,7 @@ class ExposedFormUITest extends UITestBase {
$this->helperButtonHasLabel('edit-options-group-info-add-group', t('Add another item'));
// Create a grouped filter
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
$edit = array();
$edit["options[group_info][group_items][1][title]"] = 'Is Article';
$edit["options[group_info][group_items][1][value][article]"] = 'article';
@@ -117,7 +117,7 @@ class ExposedFormUITest extends UITestBase {
// Select the empty operator, so the empty value should not trigger a form
// error.
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/body_value');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/body_value');
$edit = array();
$edit["options[group_info][group_items][1][title]"] = $this->randomName();
$edit["options[group_info][group_items][1][operator]"] = 'empty';
@@ -127,7 +127,7 @@ class ExposedFormUITest extends UITestBase {
$this->assertNoText(t('The value is required if title for this item is defined.'));
// Validate that all the titles are defined for each group
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
$edit = array();
$edit["options[group_info][group_items][1][title]"] = 'Is Article';
$edit["options[group_info][group_items][1][value][article]"] = TRUE;
@@ -143,7 +143,7 @@ class ExposedFormUITest extends UITestBase {
$this->assertRaw(t('The title is required if value for this item is defined.'), 'Group items should have a title');
// Un-expose the filter.
- $this->drupalGet('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/filter/type');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/type');
$this->drupalPostForm(NULL, array(), t('Hide filter'));
// After Un-exposing the filter, Operator and Value should be shown again.
@@ -154,7 +154,7 @@ class ExposedFormUITest extends UITestBase {
// Click the Expose sort button.
$edit = array();
- $this->drupalPostForm('admin/structure/views/nojs/config-item/test_exposed_admin_ui/default/sort/created', $edit, t('Expose sort'));
+ $this->drupalPostForm('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/sort/created', $edit, t('Expose sort'));
// Check the label of the expose button.
$this->helperButtonHasLabel('edit-options-expose-button-button', t('Hide sort'));
$this->assertFieldById('edit-options-expose-label', '', 'Make sure a label field is shown');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php
index 160e99c..12d6741 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php
@@ -39,24 +39,24 @@ class FieldUITest extends UITestBase {
$this->assertNoText('Views test: Name (Name) [' . t('hidden') . ']');
// Hides the field and check whether the hidden label is appended.
- $edit_handler_url = 'admin/structure/views/nojs/config-item/test_view/default/field/name';
+ $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
$this->drupalPostForm($edit_handler_url, array('options[exclude]' => TRUE), t('Apply'));
$this->assertText('Views test: Name (Name) [' . t('hidden') . ']');
// Ensure that the expected tokens appear in the UI.
- $edit_handler_url = 'admin/structure/views/nojs/config-item/test_view/default/field/age';
+ $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/age';
$this->drupalGet($edit_handler_url);
$result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
- $edit_handler_url = 'admin/structure/views/nojs/config-item/test_view/default/field/id';
+ $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/id';
$this->drupalGet($edit_handler_url);
$result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
$this->assertEqual((string) $result[1], '[id] == ID');
- $edit_handler_url = 'admin/structure/views/nojs/config-item/test_view/default/field/name';
+ $edit_handler_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
$this->drupalGet($edit_handler_url);
$result = $this->xpath('//details[@id="edit-options-alter-help"]/div[@class="details-wrapper"]/div[@class="item-list"]/fields/li');
$this->assertEqual((string) $result[0], '[age] == Age');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php
index d78a4a0..841a7c9 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php
@@ -33,7 +33,7 @@ class FilterBooleanWebTest extends UITestBase {
* Tests the filter boolean UI.
*/
public function testFilterBooleanUI() {
- $this->drupalPostForm('admin/structure/views/nojs/add-item/test_view/default/filter', array('name[views_test_data.status]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
+ $this->drupalPostForm('admin/structure/views/nojs/add-handler/test_view/default/filter', array('name[views_test_data.status]' => TRUE), t('Add and configure @handler', array('@handler' => t('filter criteria'))));
$this->drupalPostForm(NULL, array(), t('Expose filter'));
$this->drupalPostForm(NULL, array(), t('Grouped filters'));
@@ -51,7 +51,7 @@ class FilterBooleanWebTest extends UITestBase {
$this->drupalPostForm(NULL, $edit, t('Apply'));
- $this->drupalGet('admin/structure/views/nojs/config-item/test_view/default/filter/status');
+ $this->drupalGet('admin/structure/views/nojs/handler/test_view/default/filter/status');
$result = $this->xpath('//input[@name="options[group_info][group_items][1][value]"]');
$this->assertEqual((int) $result[1]->attributes()->checked, 'checked');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
index cffcfc3..08d5673 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
@@ -35,7 +35,7 @@ class GroupByTest extends UITestBase {
function testGroupBySave() {
$this->drupalGet('admin/structure/views/view/test_views_groupby_save/edit');
- $edit_groubpy_url = 'admin/structure/views/nojs/config-item-group/test_views_groupby_save/default/field/id';
+ $edit_groubpy_url = 'admin/structure/views/nojs/handler-group/test_views_groupby_save/default/field/id';
$this->assertNoLinkByHref($edit_groubpy_url, 0, 'No aggregation link found.');
// Enable aggregation on the view.
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
index 7ff3747..176f009 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
@@ -78,23 +78,23 @@ class HandlerTest extends UITestBase {
$handler_types = ViewExecutable::viewsHandlerTypes();
foreach ($handler_types as $type => $type_info) {
// Test adding handlers.
- $add_handler_url = "admin/structure/views/nojs/add-item/test_view_empty/default/$type";
+ $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/$type";
// Area handler types need to use a different handler.
if (in_array($type, array('header', 'footer', 'empty'))) {
$this->drupalPostForm($add_handler_url, array('name[views.area]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
$id = 'area';
- $edit_handler_url = "admin/structure/views/nojs/config-item/test_view_empty/default/$type/$id";
+ $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
}
elseif ($type == 'relationship') {
$this->drupalPostForm($add_handler_url, array('name[views_test_data.uid]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
$id = 'uid';
- $edit_handler_url = "admin/structure/views/nojs/config-item/test_view_empty/default/$type/$id";
+ $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
}
else {
$this->drupalPostForm($add_handler_url, array('name[views_test_data.job]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
$id = 'job';
- $edit_handler_url = "admin/structure/views/nojs/config-item/test_view_empty/default/$type/$id";
+ $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/$type/$id";
}
$this->assertUrl($edit_handler_url, array(), 'The user got redirected to the handler edit form.');
@@ -125,14 +125,14 @@ class HandlerTest extends UITestBase {
// Test adding a field of the user table using the uid relationship.
$type_info = $handler_types['relationship'];
- $add_handler_url = "admin/structure/views/nojs/add-item/test_view_empty/default/relationship";
+ $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/relationship";
$this->drupalPostForm($add_handler_url, array('name[views_test_data.uid]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
- $add_handler_url = "admin/structure/views/nojs/add-item/test_view_empty/default/field";
+ $add_handler_url = "admin/structure/views/nojs/add-handler/test_view_empty/default/field";
$type_info = $handler_types['field'];
$this->drupalPostForm($add_handler_url, array('name[users.signature]' => TRUE), t('Add and configure @handler', array('@handler' => $type_info['ltitle'])));
$id = 'signature';
- $edit_handler_url = "admin/structure/views/nojs/config-item/test_view_empty/default/field/$id";
+ $edit_handler_url = "admin/structure/views/nojs/handler/test_view_empty/default/field/$id";
$this->assertUrl($edit_handler_url, array(), 'The user got redirected to the handler edit form.');
$this->assertFieldByName('options[relationship]', 'uid', 'Ensure the relationship select is filled with the UID relationship.');
@@ -152,7 +152,7 @@ class HandlerTest extends UITestBase {
foreach ($handler_types as $type => $type_info) {
$this->drupalGet('admin/structure/views/view/test_view_broken/edit');
- $href = "admin/structure/views/nojs/config-item/test_view_broken/default/$type/id_broken";
+ $href = "admin/structure/views/nojs/handler/test_view_broken/default/$type/id_broken";
$result = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
$this->assertEqual(count($result), 1, String::format('Handler (%type) edit link found.', array('%type' => $type)));
@@ -186,7 +186,7 @@ class HandlerTest extends UITestBase {
foreach ($handler_types as $type => $type_info) {
$this->drupalGet('admin/structure/views/view/test_view_optional/edit');
- $href = "admin/structure/views/nojs/config-item/test_view_optional/default/$type/id_optional";
+ $href = "admin/structure/views/nojs/handler/test_view_optional/default/$type/id_optional";
$result = $this->xpath('//a[contains(@href, :href)]', array(':href' => $href));
$this->assertEqual(count($result), 1, String::format('Handler (%type) edit link found.', array('%type' => $type)));
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 01786bb..f72f839 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -971,7 +971,7 @@ class ViewEditFormController extends ViewFormControllerBase {
$actions['add'] = array(
'title' => $add_text,
- 'href' => "admin/structure/views/nojs/add-item/{$view->id()}/{$display['id']}/$type",
+ 'href' => "admin/structure/views/nojs/add-handler/{$view->id()}/{$display['id']}/$type",
'attributes' => array('class' => array('icon compact add', 'views-ajax-link'), 'id' => 'views-add-' . $type),
'html' => TRUE,
);
@@ -1039,7 +1039,7 @@ class ViewEditFormController extends ViewFormControllerBase {
if ($handler->broken()) {
$build['fields'][$id]['#class'][] = 'broken';
$field_name = $handler->adminLabel();
- $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE));
+ $build['fields'][$id]['#link'] = l($field_name, "admin/structure/views/nojs/handler/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-ajax-link')), 'html' => TRUE));
continue;
}
@@ -1056,15 +1056,15 @@ class ViewEditFormController extends ViewFormControllerBase {
// Add a [hidden] marker, if the field is excluded.
$link_text .= ' [' . $this->t('hidden') . ']';
}
- $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/config-item/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
+ $build['fields'][$id]['#link'] = l($link_text, "admin/structure/views/nojs/handler/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => $link_attributes, 'html' => TRUE));
$build['fields'][$id]['#class'][] = drupal_clean_css_identifier($display['id']. '-' . $type . '-' . $id);
if ($executable->display_handler->useGroupBy() && $handler->usesGroupBy()) {
- $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . $this->t('Aggregation settings') . '</span>', "admin/structure/views/nojs/config-item-group/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => $this->t('Aggregation settings')), 'html' => TRUE));
+ $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . $this->t('Aggregation settings') . '</span>', "admin/structure/views/nojs/handler-group/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => $this->t('Aggregation settings')), 'html' => TRUE));
}
if ($handler->hasExtraOptions()) {
- $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . $this->t('Settings') . '</span>', "admin/structure/views/nojs/config-item-extra/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => $this->t('Settings')), 'html' => TRUE));
+ $build['fields'][$id]['#settings_links'][] = l('<span class="label">' . $this->t('Settings') . '</span>', "admin/structure/views/nojs/handler-extra/{$view->id()}/{$display['id']}/$type/$id", array('attributes' => array('class' => array('views-button-configure', 'views-ajax-link'), 'title' => $this->t('Settings')), 'html' => TRUE));
}
if ($grouping) {
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
index e0d472f..4890dc9 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -126,11 +126,11 @@ class ViewUI implements ViewStorageInterface {
* @var array
*/
public static $forms = array(
- 'add-item' => '\Drupal\views_ui\Form\Ajax\AddItem',
+ 'add-handler' => '\Drupal\views_ui\Form\Ajax\AddItem',
'analyze' => '\Drupal\views_ui\Form\Ajax\Analyze',
- 'config-item' => '\Drupal\views_ui\Form\Ajax\ConfigItem',
- 'config-item-extra' => '\Drupal\views_ui\Form\Ajax\ConfigItemExtra',
- 'config-item-group' => '\Drupal\views_ui\Form\Ajax\ConfigItemGroup',
+ 'handler' => '\Drupal\views_ui\Form\Ajax\ConfigHandler',
+ 'handler-extra' => '\Drupal\views_ui\Form\Ajax\ConfigHandlerExtra',
+ 'handler-group' => '\Drupal\views_ui\Form\Ajax\ConfigHandlerGroup',
'display' => '\Drupal\views_ui\Form\Ajax\Display',
'edit-details' => '\Drupal\views_ui\Form\Ajax\EditDetails',
'rearrange' => '\Drupal\views_ui\Form\Ajax\Rearrange',
@@ -485,7 +485,7 @@ class ViewUI implements ViewStorageInterface {
if ($cut = strpos($field, '$')) {
$field = substr($field, 0, $cut);
}
- $id = $this->executable->addItem($form_state['display_id'], $type, $table, $field);
+ $id = $this->executable->addHandler($form_state['display_id'], $type, $table, $field);
// check to see if we have group by settings
$key = $type;
@@ -499,15 +499,15 @@ class ViewUI implements ViewStorageInterface {
);
$handler = Views::handlerManager($key)->getHandler($item);
if ($this->executable->displayHandlers->get('default')->useGroupBy() && $handler->usesGroupBy()) {
- $this->addFormToStack('config-item-group', $form_state['display_id'], $type, $id);
+ $this->addFormToStack('handler-group', $form_state['display_id'], $type, $id);
}
// check to see if this type has settings, if so add the settings form first
if ($handler && $handler->hasExtraOptions()) {
- $this->addFormToStack('config-item-extra', $form_state['display_id'], $type, $id);
+ $this->addFormToStack('handler-extra', $form_state['display_id'], $type, $id);
}
// Then add the form to the stack
- $this->addFormToStack('config-item', $form_state['display_id'], $type, $id);
+ $this->addFormToStack('handler', $form_state['display_id'], $type, $id);
}
}
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index ed4ba63..f90508c 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -238,13 +238,13 @@ function views_ui_view_preview_section_handler_links(ViewExecutable $view, $type
$field_name = $handler->adminLabel(TRUE);
$links[$type . '-edit-' . $id] = array(
'title' => t('Edit @section', array('@section' => $field_name)),
- 'href' => "admin/structure/views/nojs/config-item/{$view->storage->id()}/{$display['id']}/$type/$id",
+ 'href' => "admin/structure/views/nojs/handler/{$view->storage->id()}/{$display['id']}/$type/$id",
'attributes' => array('class' => array('views-ajax-link')),
);
}
$links[$type . '-add'] = array(
'title' => t('Add new'),
- 'href' => "admin/structure/views/nojs/add-item/{$view->storage->id()}/{$display['id']}/$type",
+ 'href' => "admin/structure/views/nojs/add-handler/{$view->storage->id()}/{$display['id']}/$type",
'attributes' => array('class' => array('views-ajax-link')),
);
diff --git a/core/modules/views_ui/views_ui.routing.yml b/core/modules/views_ui/views_ui.routing.yml
index 1d8128a..03c6b95 100644
--- a/core/modules/views_ui/views_ui.routing.yml
+++ b/core/modules/views_ui/views_ui.routing.yml
@@ -120,14 +120,14 @@ views_ui.break_lock:
requirements:
_permission: 'administer views'
-views_ui.form_add_item:
- path: '/admin/structure/views/{js}/add-item/{view}/{display_id}/{type}'
+views_ui.form_add_handler:
+ path: '/admin/structure/views/{js}/add-handler/{view}/{display_id}/{type}'
options:
parameters:
view:
tempstore: TRUE
defaults:
- _content: '\Drupal\views_ui\Form\Ajax\AddItem::getForm'
+ _content: '\Drupal\views_ui\Form\Ajax\AddHandler::getForm'
requirements:
_permission: 'administer views'
js: 'nojs|ajax'
@@ -204,38 +204,38 @@ views_ui.form_display:
_permission: 'administer views'
js: 'nojs|ajax'
-views_ui.form_config_item:
- path: '/admin/structure/views/{js}/config-item/{view}/{display_id}/{type}/{id}'
+views_ui.form_handler:
+ path: '/admin/structure/views/{js}/handler/{view}/{display_id}/{type}/{id}'
options:
parameters:
view:
tempstore: TRUE
defaults:
- _content: '\Drupal\views_ui\Form\Ajax\ConfigItem::getForm'
+ _content: '\Drupal\views_ui\Form\Ajax\ConfigHandler::getForm'
requirements:
_permission: 'administer views'
js: 'nojs|ajax'
-views_ui.form_config_item_extra:
- path: '/admin/structure/views/{js}/config-item-extra/{view}/{display_id}/{type}/{id}'
+views_ui.form_handler_extra:
+ path: '/admin/structure/views/{js}/handler-extra/{view}/{display_id}/{type}/{id}'
options:
parameters:
view:
tempstore: TRUE
defaults:
- _content: '\Drupal\views_ui\Form\Ajax\ConfigItemExtra::getForm'
+ _content: '\Drupal\views_ui\Form\Ajax\ConfigHandlerExtra::getForm'
requirements:
_permission: 'administer views'
js: 'nojs|ajax'
-views_ui.form_config_item_group:
- path: '/admin/structure/views/{js}/config-item-group/{view}/{display_id}/{type}/{id}'
+views_ui.form_handler_group:
+ path: '/admin/structure/views/{js}/handler-group/{view}/{display_id}/{type}/{id}'
options:
parameters:
view:
tempstore: TRUE
defaults:
- _content: '\Drupal\views_ui\Form\Ajax\ConfigItemGroup::getForm'
+ _content: '\Drupal\views_ui\Form\Ajax\ConfigHandlerGroup::getForm'
form_state: NULL
requirements:
_permission: 'administer views'