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

Issue #1757564 by damiankloip, dawehner, tim.plunkett: Change 'name' to 'id' on View entity.

8.0.x
webchick 2013-01-18 21:10:42 -08:00
parent e15c6de807
commit dd8c44b490
132 changed files with 277 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml
View File

@ -1,5 +1,5 @@
base_table: node
name: test_bulk_form
id: test_bulk_form
description: ''
tag: ''
human_name: form

10
core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
View File

@ -38,7 +38,7 @@ class WizardTest extends WizardTestBase {
public function testCommentWizard() {
$view = array();
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['show[wizard_key]'] = 'comment';
$view['page[create]'] = TRUE;
$view['page[path]'] = $this->randomName(16);
@ -46,7 +46,7 @@ class WizardTest extends WizardTestBase {
// Just triggering the saving should automatically choose a proper row
// plugin.
$this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
$this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
$this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
// If we update the type first we should get a selection of comment valid
// row plugins as the select field.
@ -67,11 +67,11 @@ class WizardTest extends WizardTestBase {
$expected_options = array('comment', 'fields');
$this->assertEqual($options, $expected_options);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$this->drupalPost(NULL, $view, t('Save and edit'));
$this->assertUrl('admin/structure/views/view/' . $view['name'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
$this->assertUrl('admin/structure/views/view/' . $view['id'], array(), 'Make sure the view saving was successful and the browser got redirected to the edit page.');
$view = views_get_view($view['name']);
$view = views_get_view($view['id']);
$view->initHandlers();
$row = $view->display_handler->getOption('row');
$this->assertEqual($row['type'], 'comment');

2
core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml
View File

@ -60,6 +60,6 @@ display:
path: test-comment-rss
human_name: test_comment_rss
module: views
name: test_comment_rss
id: test_comment_rss
tag: ''
uuid: 9b1b1e58-d41b-468a-9d04-4e6bde742c29

2
core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml
View File

@ -44,5 +44,5 @@ display:
id: default
position: '0'
human_name: test_comment_user_uid
name: test_comment_user_uid
id: test_comment_user_uid
tag: default

2
core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml
View File

@ -34,5 +34,5 @@ display:
id: default
position: '0'
human_name: test_view_fieldapi
name: test_view_fieldapi
id: test_view_fieldapi
tag: default

2
core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml
View File

@ -16,5 +16,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_field_type
id: test_field_type
tag: ''

2
core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml
View File

@ -46,5 +46,5 @@ display:
id: default
position: '0'
human_name: test_filter_node_uid_revision
name: test_filter_node_uid_revision
id: test_filter_node_uid_revision
tag: default

2
core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml
View File

@ -1,4 +1,4 @@
name: test_node_revision_nid
id: test_node_revision_nid
base_table: node_revision
core: 8
api_version: 3

2
core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml
View File

@ -1,4 +1,4 @@
name: test_node_revision_vid
id: test_node_revision_vid
base_table: node_revision
core: 8
api_version: 3

2
core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml
View File

@ -1,5 +1,5 @@
base_table: node
name: test_status_extra
id: test_status_extra
description: ''
tag: ''
human_name: test_status_extra

2
core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml
View File

@ -1,5 +1,5 @@
base_table: entity_test
name: test_serializer_display_entity
id: test_serializer_display_entity
description: ''
tag: ''
human_name: 'Test serialize display entity rows'

2
core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml
View File

@ -1,5 +1,5 @@
base_table: views_test_data
name: test_serializer_display_field
id: test_serializer_display_field
description: ''
tag: ''
human_name: 'Test serializer display field rows'

2
core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml
View File

@ -62,5 +62,5 @@ display:
human_name: test_groupwise
langcode: und
module: views
name: test_groupwise_term
id: test_groupwise_term
tag: default

2
core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml
View File

@ -69,5 +69,5 @@ display:
id: default
position: '0'
human_name: test_taxonomy_node_term_data
name: test_taxonomy_node_term_data
id: test_taxonomy_node_term_data
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_access_perm.yml
View File

@ -25,5 +25,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_access_perm
id: test_access_perm
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_access_role.yml
View File

@ -23,5 +23,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_access_role
id: test_access_role
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_groupwise_user.yml
View File

@ -72,5 +72,5 @@ display:
human_name: test_groupwise_user
langcode: und
module: views
name: test_groupwise_user
id: test_groupwise_user
tag: default

2
core/modules/user/tests/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml
View File

@ -52,5 +52,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_plugin_argument_default_current_user
id: test_plugin_argument_default_current_user
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_user_name.yml
View File

@ -49,5 +49,5 @@ display:
id: page_1
position: '0'
human_name: ''
name: test_user_name
id: test_user_name
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_user_relationship.yml
View File

@ -98,5 +98,5 @@ display:
id: default
position: '0'
human_name: test_user_relationship
name: test_user_relationship
id: test_user_relationship
tag: default

2
core/modules/user/tests/user_test_views/test_views/views.view.test_user_uid_argument.yml
View File

@ -23,4 +23,4 @@ display:
id: default
position: '0'
human_name:
name: test_user_uid_argument
id: test_user_uid_argument

2
core/modules/user/tests/user_test_views/test_views/views.view.test_view_argument_validate_user.yml
View File

@ -33,5 +33,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_view_argument_validate_user
id: test_view_argument_validate_user
tag: ''

2
core/modules/user/tests/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml
View File

@ -46,5 +46,5 @@ display:
id: default
position: '0'
human_name: test_views_handler_field_user_name
name: test_views_handler_field_user_name
id: test_views_handler_field_user_name
tag: default

2
core/modules/views/config/views.view.archive.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: node
name: archive
id: archive
description: 'A list of months that link to content for that month.'
tag: default
base_table: node

2
core/modules/views/config/views.view.backlinks.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: search
name: backlinks
id: backlinks
description: 'A list of other content items which have a link to the content item.'
tag: default
base_table: node

2
core/modules/views/config/views.view.comments_recent.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: comment
name: comments_recent
id: comments_recent
description: 'A block and a page with recent comments.'
tag: default
base_table: comment

2
core/modules/views/config/views.view.frontpage.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: node
name: frontpage
id: frontpage
description: 'Emulates the default Drupal front page; you may set the default home page path to this view to make it your front page.'
tag: default
base_table: node

2
core/modules/views/config/views.view.glossary.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: node
name: glossary
id: glossary
description: 'A list of all content, by letter.'
tag: default
base_table: node

2
core/modules/views/config/views.view.taxonomy_term.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: taxonomy
name: taxonomy_term
id: taxonomy_term
description: 'Customize the default taxonomy/term display.'
tag: default
base_table: node

2
core/modules/views/config/views.view.tracker.yml
View File

@ -1,7 +1,7 @@
disabled: true
api_version: '3.0'
module: node
name: tracker
id: tracker
description: 'Shows all new activity on the system.'
tag: default
base_table: node

2
core/modules/views/includes/ajax.inc
View File

@ -208,7 +208,7 @@ function views_ajax_command_replace_title($title) {
$command = array(
'command' => 'viewsReplaceTitle',
'title' => $title,
'siteName' => config('system.site')->get('name'),
'siteName' => config('system.site')->id(),
);
return $command;
}

17
core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
View File

@ -32,7 +32,7 @@ use Drupal\Core\Annotation\Translation;
* config_prefix = "views.view",
* fieldable = FALSE,
* entity_keys = {
* "id" = "name",
* "id" = "id",
* "label" = "human_name",
* "uuid" = "uuid"
* }
@ -48,11 +48,11 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
protected $base_table = 'node';
/**
* The name of the view.
* The unique ID of the view.
*
* @var string
*/
public $name = NULL;
public $id = NULL;
/**
* The description of the view, which is used only in the interface.
@ -161,13 +161,6 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
);
}
/**
* Overrides Drupal\Core\Entity\EntityInterface::id().
*/
public function id() {
return $this->get('name');
}
/**
* Overrides Drupal\Core\Config\Entity\ConfigEntityBase::createDuplicate().
*/
@ -207,7 +200,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
*/
public function getHumanName() {
if (!$human_name = $this->get('human_name')) {
$human_name = $this->get('name');
$human_name = $this->id();
}
return $human_name;
}
@ -405,7 +398,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
'display',
'human_name',
'module',
'name',
'id',
'tag',
'uuid',
);

2
core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
View File

@ -49,7 +49,7 @@ class ViewsBlock implements DerivativeInterface {
foreach ($executable->displayHandlers as $display) {
// Add a block plugin definition for each block display.
if (isset($display) && !empty($display->definition['uses_hook_block'])) {
$delta = $view->get('name') . '-' . $display->display['id'];
$delta = $view->id() . '-' . $display->display['id'];
$desc = $display->getOption('block_description');
if (empty($desc)) {

4
core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
View File

@ -50,8 +50,8 @@ class ViewsExposedFilterBlock implements DerivativeInterface {
if (isset($display) && $display->getOption('exposed_block')) {
// Add a block definition for the block.
if ($display->usesExposedFormInBlock()) {
$delta = $view->get('name') . '-' . $display->display['id'];
$desc = t('Exposed form: @view-@display_id', array('@view' => $view->get('name'), '@display_id' => $display->display['id']));
$delta = $view->id() . '-' . $display->display['id'];
$desc = t('Exposed form: @view-@display_id', array('@view' => $view->id(), '@display_id' => $display->display['id']));
$this->derivatives[$delta] = array(
'subject' => $desc,
'cache' => DRUPAL_NO_CACHE,

2
core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
View File

@ -821,7 +821,7 @@ abstract class HandlerBase extends PluginBase {
return $views_data['table']['entity type'];
}
else {
throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->get('name'))));
throw new \Exception(format_string('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
}
}

2
core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
View File

@ -35,7 +35,7 @@ class View extends AreaPluginBase {
public function buildOptionsForm(&$form, &$form_state) {
parent::buildOptionsForm($form, $form_state);
$view_display = $this->view->storage->get('name') . ':' . $this->view->current_display;
$view_display = $this->view->storage->id() . ':' . $this->view->current_display;
$options = array('' => t('-Select-'));
$options += views_get_views_as_options(FALSE, 'all', $view_display, FALSE, TRUE);

6
core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php vendored
View File

@ -180,7 +180,7 @@ abstract class CachePluginBase extends PluginBase {
* to be sure that we catch everything. Maybe that's a bad idea.
*/
function cache_flush() {
cache($this->table)->deleteTags(array($this->view->storage->get('name') => TRUE));
cache($this->table)->deleteTags(array($this->view->storage->id() => TRUE));
}
/**
@ -295,7 +295,7 @@ abstract class CachePluginBase extends PluginBase {
}
}
$this->resultsKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data));
$this->resultsKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data));
}
return $this->resultsKey;
@ -319,7 +319,7 @@ abstract class CachePluginBase extends PluginBase {
'base_url' => $GLOBALS['base_url'],
);
$this->outputKey = $this->view->storage->get('name') . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data));
$this->outputKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':output:' . hash('sha256', serialize($key_data));
}
return $this->outputKey;

6
core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
View File

@ -977,7 +977,7 @@ abstract class DisplayPluginBase extends PluginBase {
$title = $text;
}
return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->get('name') . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE));
return l($text, 'admin/structure/views/nojs/display/' . $this->view->storage->id() . '/' . $this->display['id'] . '/' . $section, array('attributes' => array('class' => 'views-ajax-link ' . $class, 'title' => $title, 'id' => drupal_html_id('views-' . $this->display['id'] . '-' . $section)), 'html' => TRUE));
}
/**
@ -2627,8 +2627,8 @@ abstract class DisplayPluginBase extends PluginBase {
$blocks = array();
if ($this->usesExposedFormInBlock()) {
$delta = '-exp-' . $this->view->storage->get('name') . '-' . $this->display['id'];
$desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->get('name'), '@display_id' => $this->display['id']));
$delta = '-exp-' . $this->view->storage->id() . '-' . $this->display['id'];
$desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->storage->id(), '@display_id' => $this->display['id']));
$blocks[$delta] = array(
'info' => $desc,

6
core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
View File

@ -41,7 +41,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
// views_arg_load -- which lives in views.module.
$bits = explode('/', $this->getOption('path'));
$page_arguments = array($this->view->storage->name, $this->display['id']);
$page_arguments = array($this->view->storage->id(), $this->display['id']);
$this->view->initHandlers();
$view_arguments = $this->view->argument;
@ -103,7 +103,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
'access callback' => 'views_access',
'access arguments' => $access_arguments,
// Identify URL embedded arguments and correlate them to a handler.
'load arguments' => array($this->view->storage->name, $this->display['id'], '%index'),
'load arguments' => array($this->view->storage->id(), $this->display['id'], '%index'),
);
$menu = $this->getOption('menu');
if (empty($menu)) {
@ -165,7 +165,7 @@ abstract class PathPluginBase extends DisplayPluginBase {
'access arguments' => $access_arguments,
// Identify URL embedded arguments and correlate them to a
// handler.
'load arguments' => array($this->view->storage->name, $this->display['id'], '%index'),
'load arguments' => array($this->view->storage->id(), $this->display['id'], '%index'),
'title' => $tab_options['title'],
'description' => $tab_options['description'],
'menu_name' => $tab_options['name'],

4
core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
View File

@ -284,8 +284,8 @@ abstract class ExposedFormPluginBase extends PluginBase {
// remember settings.
$display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
if (isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
unset($_SESSION['views'][$this->view->storage->get('name')][$display_id]);
if (isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
unset($_SESSION['views'][$this->view->storage->id()][$display_id]);
}
// Set the form to allow redirect.

12
core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
View File

@ -1611,19 +1611,19 @@ If you would like to have the characters \'[\' and \']\' please use the html ent
$display = $this->view->display_handler->display;
if (!empty($display)) {
$themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['id'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['id'];
$themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['id'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['id'];
$themes[] = $hook . '__' . $display['id'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $display['id'];
if ($display['id'] != $display['display_plugin']) {
$themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['display_plugin'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $display['display_plugin'];
$themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['display_plugin'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->id() . '__' . $display['display_plugin'];
$themes[] = $hook . '__' . $display['display_plugin'] . '__' . $this->options['id'];
$themes[] = $hook . '__' . $display['display_plugin'];
}
}
$themes[] = $hook . '__' . $this->view->storage->get('name') . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->get('name');
$themes[] = $hook . '__' . $this->view->storage->id() . '__' . $this->options['id'];
$themes[] = $hook . '__' . $this->view->storage->id();
$themes[] = $hook . '__' . $this->options['id'];
$themes[] = $hook;

20
core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
View File

@ -1244,8 +1244,8 @@ abstract class FilterPluginBase extends HandlerBase {
// false means that we got a setting that means to recuse ourselves,
// so we should erase whatever happened to be there.
if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
$session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
if ($status === FALSE && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
$session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
if (isset($session[$this->options['group_info']['identifier']])) {
unset($session[$this->options['group_info']['identifier']]);
@ -1253,11 +1253,11 @@ abstract class FilterPluginBase extends HandlerBase {
}
if ($status !== FALSE) {
if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
$_SESSION['views'][$this->view->storage->get('name')][$display_id] = array();
if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
$_SESSION['views'][$this->view->storage->id()][$display_id] = array();
}
$session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
$session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
$session[$this->options['group_info']['identifier']] = $input[$this->options['group_info']['identifier']];
}
@ -1338,8 +1338,8 @@ abstract class FilterPluginBase extends HandlerBase {
// false means that we got a setting that means to recuse ourselves,
// so we should erase whatever happened to be there.
if (!$status && isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
$session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
if (!$status && isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
$session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
if ($operator && isset($session[$this->options['expose']['operator_id']])) {
unset($session[$this->options['expose']['operator_id']]);
}
@ -1350,11 +1350,11 @@ abstract class FilterPluginBase extends HandlerBase {
}
if ($status) {
if (!isset($_SESSION['views'][$this->view->storage->get('name')][$display_id])) {
$_SESSION['views'][$this->view->storage->get('name')][$display_id] = array();
if (!isset($_SESSION['views'][$this->view->storage->id()][$display_id])) {
$_SESSION['views'][$this->view->storage->id()][$display_id] = array();
}
$session = &$_SESSION['views'][$this->view->storage->get('name')][$display_id];
$session = &$_SESSION['views'][$this->view->storage->id()][$display_id];
if ($operator && isset($input[$this->options['expose']['operator_id']])) {
$session[$this->options['expose']['operator_id']] = $input[$this->options['expose']['operator_id']];

6
core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
View File

@ -1283,7 +1283,7 @@ class Sql extends QueryPluginBase {
$query = Database::getConnection($target, $key)
->select($this->view->storage->get('base_table'), $this->view->storage->get('base_table'), $options)
->addTag('views')
->addTag('views_' . $this->view->storage->get('name'));
->addTag('views_' . $this->view->storage->id());
// Add the tags added to the view itself.
foreach ($this->tags as $tag) {
@ -1514,7 +1514,7 @@ class Sql extends QueryPluginBase {
drupal_set_message($e->getMessage(), 'error');
}
else {
throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->get('name'), '@message' => $e->getMessage())));
throw new DatabaseExceptionWrapper(format_string('Exception in @human_name[@view_name]: @message', array('@human_name' => $view->storage->getHumanName(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage())));
}
}
@ -1646,7 +1646,7 @@ class Sql extends QueryPluginBase {
}
function add_signature(ViewExecutable $view) {
$view->query->add_field(NULL, "'" . $view->storage->get('name') . ':' . $view->current_display . "'", 'view_name');
$view->query->add_field(NULL, "'" . $view->storage->id() . ':' . $view->current_display . "'", 'view_name');
}
function get_aggregation_info() {

8
core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
View File

@ -132,10 +132,10 @@ class GroupwiseMax extends RelationshipPluginBase {
// TODO: check the field is the correct sort?
// or let users hang themselves at this stage and check later?
if ($view->type == 'Default') {
$views[t('Default Views')][$view->storage->get('name')] = $view->storage->get('name');
$views[t('Default Views')][$view->storage->id()] = $view->storage->id();
}
else {
$views[t('Existing Views')][$view->storage->get('name')] = $view->storage->get('name');
$views[t('Existing Views')][$view->storage->id()] = $view->storage->id();
}
}
}
@ -171,7 +171,7 @@ class GroupwiseMax extends RelationshipPluginBase {
* When the form is submitted, take sure to clear the subquery string cache.
*/
public function submitOptionsForm(&$form, &$form_state) {
$cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id'];
$cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id'];
cache('views_results')->delete($cid);
}
@ -362,7 +362,7 @@ class GroupwiseMax extends RelationshipPluginBase {
}
else {
// Get the stored subquery SQL string.
$cid = 'views_relationship_groupwise_max:' . $this->view->storage->get('name') . ':' . $this->view->current_display . ':' . $this->options['id'];
$cid = 'views_relationship_groupwise_max:' . $this->view->storage->id() . ':' . $this->view->current_display . ':' . $this->options['id'];
$cache = cache('views_results')->get($cid);
if (isset($cache->data)) {
$def['left_query'] = $cache->data;

2
core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
View File

@ -621,7 +621,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface {
protected function instantiate_view($form, &$form_state) {
// Build the basic view properties and create the view.
$values = array(
'name' => $form_state['values']['name'],
'id' => $form_state['values']['id'],
'human_name' => $form_state['values']['human_name'],
'description' => $form_state['values']['description'],
'base_table' => $this->base_table,

2
core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
View File

@ -133,7 +133,7 @@ class DefaultViewsTest extends WebTestBase {
$view->preExecute($this->viewArgMap[$name]);
}
$this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->get('name'))));
$this->assert(TRUE, format_string('View @view will be executed.', array('@view' => $view->storage->id())));
$view->execute();
$tokens = array('@name' => $name, '@display_id' => $display_id);

2
core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
View File

@ -208,7 +208,7 @@ class ModuleTest extends ViewUnitTestBase {
foreach ($views as $id => $view) {
foreach ($view->get('display') as $display_id => $display) {
$expected_options[$view->id() . ':' . $display['id']] = t('View: @view - Display: @display',
array('@view' => $view->name, '@display' => $display['id']));
array('@view' => $view->id(), '@display' => $display['id']));
}
}

4
core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
View File

@ -131,7 +131,7 @@ class CacheTest extends PluginTestBase {
// so they should be added to the css/js storage.
$view = views_get_view('test_view');
$view->setDisplay();
$view->storage->set('name', 'test_cache_header_storage');
$view->storage->set('id', 'test_cache_header_storage');
$view->display_handler->overrideOption('cache', array(
'type' => 'time',
'options' => array(
@ -158,7 +158,7 @@ class CacheTest extends PluginTestBase {
// Now add some css/jss before running the view.
// Make sure that this css is not added when running the cached view.
$view->storage->set('name', 'test_cache_header_storage_2');
$view->storage->set('id', 'test_cache_header_storage_2');
$system_css_path = drupal_get_path('module', 'system') . '/system.maintenance.css';
drupal_add_css($system_css_path);

2
core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
View File

@ -44,7 +44,7 @@ class TokenReplaceTest extends ViewUnitTestBase {
$expected = array(
'[view:name]' => 'Test tokens',
'[view:description]' => 'Test view to token replacement tests.',
'[view:machine-name]' => 'test_tokens',
'[view:id]' => 'test_tokens',
'[view:title]' => 'Test token page',
'[view:url]' => url('test_tokens', array('absolute' => TRUE)),
'[view:total-rows]' => (string) $view->total_rows,

4
core/modules/views/lib/Drupal/views/Tests/UI/DefaultViewsTest.php
View File

@ -84,7 +84,7 @@ class DefaultViewsTest extends UITestBase {
$this->drupalGet('admin/structure/views');
$this->clickViewsOperationLink(t('Clone'), '/frontpage');
$edit = array(
'name' => 'clone_of_frontpage',
'id' => 'clone_of_frontpage',
);
$this->assertTitle(t('Clone of @human_name | @site-name', array('@human_name' => 'Front page', '@site-name' => config('system.site')->get('name'))));
$this->drupalPost(NULL, $edit, t('Clone'));
@ -94,7 +94,7 @@ class DefaultViewsTest extends UITestBase {
$this->drupalGet('admin/structure/views');
$this->clickViewsOperationLink(t('Clone'), '/frontpage');
$random_name = strtolower($this->randomName());
$this->drupalPost(NULL, array('name' => $random_name), t('Clone'));
$this->drupalPost(NULL, array('id' => $random_name), t('Clone'));
$this->assertUrl("admin/structure/views/view/$random_name/edit", array(), 'The custom view name got saved.');
// Now disable the view, and make sure it stops appearing on the main view

4
core/modules/views/lib/Drupal/views/Tests/UI/DisplayExtenderUITest.php
View File

@ -34,7 +34,7 @@ class DisplayExtenderUITest extends UITestBase {
config('views.settings')->set('display_extenders', array('display_extender_test'))->save();
$view = views_get_view('test_view');
$view_edit_url = "admin/structure/views/view/{$view->storage->get('name')}/edit";
$view_edit_url = "admin/structure/views/view/{$view->storage->id()}/edit";
$display_option_url = 'admin/structure/views/nojs/display/test_view/default/test_extender_test_option';
$this->drupalGet($view_edit_url);
@ -44,7 +44,7 @@ class DisplayExtenderUITest extends UITestBase {
$this->drupalPost($display_option_url, array('test_extender_test_option' => $random_text), t('Apply'));
$this->assertLink($random_text);
$this->drupalPost(NULL, array(), t('Save'));
$view = views_get_view($view->storage->get('name'));
$view = views_get_view($view->storage->id());
$view->initDisplay();
$this->assertEqual($view->display_handler->getOption('test_extender_test_option'), $random_text, 'Make sure that the display extender option got saved.');
}

16
core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
View File

@ -34,10 +34,10 @@ class DisplayTest extends UITestBase {
// Create a new view in the UI.
$default = array();
$default['human_name'] = $this->randomName(16);
$default['name'] = strtolower($this->randomName(16));
$default['id'] = strtolower($this->randomName(16));
$default['description'] = $this->randomName(16);
$default['page[create]'] = TRUE;
$default['page[path]'] = $default['name'];
$default['page[path]'] = $default['id'];
$view += $default;
@ -51,7 +51,7 @@ class DisplayTest extends UITestBase {
*/
public function testRemoveDisplay() {
$view = $this->randomView();
$path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
$path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
$this->drupalGet($path_prefix . '/default');
$this->assertNoFieldById('edit-displays-settings-settings-content-tab-content-details-top-actions-delete', 'delete Page', 'Make sure there is no delete button on the default display.');
@ -90,7 +90,7 @@ class DisplayTest extends UITestBase {
$settings['page[create]'] = FALSE;
$view = $this->randomView($settings);
$path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
$path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
$this->drupalGet($path_prefix);
// Add a new display.
@ -109,7 +109,7 @@ class DisplayTest extends UITestBase {
'block[create]' => TRUE
);
$view = $this->randomView($view);
$path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
$path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
$this->clickLink(t('reorder displays'));
$this->assertTrue($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing');
@ -124,7 +124,7 @@ class DisplayTest extends UITestBase {
$this->drupalPost(NULL, $edit, t('Apply'));
$this->drupalPost(NULL, array(), t('Save'));
$view = views_get_view($view['name']);
$view = views_get_view($view['id']);
$displays = $view->storage->get('display');
$this->assertEqual($displays['default']['position'], 0, 'Make sure the master display comes first.');
$this->assertEqual($displays['block_1']['position'], 1, 'Make sure the block display comes before the page display.');
@ -145,7 +145,7 @@ class DisplayTest extends UITestBase {
*/
public function testCloneDisplay() {
$view = $this->randomView();
$path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
$path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
$this->drupalGet($path_prefix);
$this->drupalPost(NULL, array(), 'clone Page');
@ -157,7 +157,7 @@ class DisplayTest extends UITestBase {
*/
public function testDisableDisplay() {
$view = $this->randomView();
$path_prefix = 'admin/structure/views/view/' . $view['name'] .'/edit';
$path_prefix = 'admin/structure/views/view/' . $view['id'] .'/edit';
$this->drupalGet($path_prefix);
$this->assertFalse($this->xpath('//div[contains(@class, :class)]', array(':class' => 'views-display-disabled')), 'Make sure the disabled display css class does not appear after initial adding of a view.');

30
core/modules/views/lib/Drupal/views/Tests/UI/OverrideDisplaysTest.php
View File

@ -27,7 +27,7 @@ class OverrideDisplaysTest extends UITestBase {
// Create a basic view that shows all content, with a page and a block
// display.
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['page[create]'] = 1;
$view['page[path]'] = $this->randomName(16);
$view['block[create]'] = 1;
@ -41,8 +41,8 @@ class OverrideDisplaysTest extends UITestBase {
$edit = array();
$edit['title'] = $original_title = $this->randomName(16);
$edit['override[dropdown]'] = 'default';
$this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
$this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
// Add a node that will appear in the view, so that the block will actually
// be displayed.
@ -58,7 +58,7 @@ class OverrideDisplaysTest extends UITestBase {
$this->assertText('View: ' . $view['human_name']);
// Place the block.
$this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
$this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
// Make sure the title appears in the block.
$this->drupalGet('');
@ -69,8 +69,8 @@ class OverrideDisplaysTest extends UITestBase {
$edit = array();
$edit['title'] = $new_title = $this->randomName(16);
$edit['override[dropdown]'] = 'page_1';
$this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
$this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
$this->drupalGet($view_path);
$this->assertResponse(200);
$this->assertText($new_title);
@ -86,7 +86,7 @@ class OverrideDisplaysTest extends UITestBase {
// page and feed to inherit their titles from the default display, but the
// block to override it.
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['page[create]'] = 1;
$view['page[title]'] = $this->randomName(16);
$view['page[path]'] = $this->randomName(16);
@ -117,7 +117,7 @@ class OverrideDisplaysTest extends UITestBase {
$this->assertText('View: ' . $view['human_name']);
// Place the block.
$this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
$this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
$this->drupalGet('');
$this->assertText($view['block[title]']);
$this->assertNoText($view['page[title]']);
@ -126,8 +126,8 @@ class OverrideDisplaysTest extends UITestBase {
// the feed's title also, but not the block.
$edit = array();
$edit['title'] = $new_default_title = $this->randomName(16);
$this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/page_1", array(), t('Save'));
$this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['id']}/edit/page_1", array(), t('Save'));
$this->drupalGet($view['page[path]']);
$this->assertResponse(200);
$this->assertText($new_default_title);
@ -146,8 +146,8 @@ class OverrideDisplaysTest extends UITestBase {
// the block title only, and leave the defaults alone.
$edit = array();
$edit['title'] = $new_block_title = $this->randomName(16);
$this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save'));
$this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
$this->drupalGet($view['page[path]']);
$this->assertResponse(200);
$this->assertText($new_default_title);
@ -168,7 +168,7 @@ class OverrideDisplaysTest extends UITestBase {
// Because there is both a title on page and block we expect the title on
// the block be overriden.
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['page[create]'] = 1;
$view['page[title]'] = $this->randomName(16);
$view['page[path]'] = $this->randomName(16);
@ -182,8 +182,8 @@ class OverrideDisplaysTest extends UITestBase {
$edit['title'] = $new_block_title = $this->randomName();
$edit['override[dropdown]'] = 'default_revert';
$this->drupalPost("admin/structure/views/nojs/display/{$view['name']}/block_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['name']}/edit/block_1", array(), t('Save'));
$this->drupalPost("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
$this->drupalPost("admin/structure/views/view/{$view['id']}/edit/block_1", array(), t('Save'));
$this->assertText($view['page[title]']);
}

10
core/modules/views/lib/Drupal/views/Tests/UI/SettingsTest.php
View File

@ -45,7 +45,7 @@ class SettingsTest extends UITestBase {
$view = array();
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['description'] = $this->randomName(16);
$view['page[create]'] = TRUE;
$view['page[title]'] = $this->randomName(16);
@ -65,7 +65,7 @@ class SettingsTest extends UITestBase {
// Create a view with an additional display, so master should be hidden.
$view['page[create]'] = TRUE;
$view['name'] = strtolower($this->randomName());
$view['id'] = strtolower($this->randomName());
$this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
$this->assertNoLink(t('Master'));
@ -79,7 +79,7 @@ class SettingsTest extends UITestBase {
);
$this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
$view['name'] = strtolower($this->randomName());
$view['id'] = strtolower($this->randomName());
$this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
$this->assertFieldById('edit-displays-top-add-display-embed');
@ -97,7 +97,7 @@ class SettingsTest extends UITestBase {
);
$this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
$view['name'] = strtolower($this->randomName());
$view['id'] = strtolower($this->randomName());
$this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
$this->drupalPost(NULL, array(), t('Update preview'));
@ -109,7 +109,7 @@ class SettingsTest extends UITestBase {
);
$this->drupalPost('admin/structure/views/settings', $edit, t('Save configuration'));
$view['name'] = strtolower($this->randomName());
$view['id'] = strtolower($this->randomName());
$this->drupalPost('admin/structure/views/add', $view, t('Save and edit'));
$this->drupalPost(NULL, array(), t('Update preview'));

2
core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php
View File

@ -34,7 +34,7 @@ class TagTest extends ViewUnitTestBase {
$suffix = $i % 2 ? 'odd' : 'even';
$tag = 'autocomplete_tag_test_' . $suffix . $this->randomName();
$tags[] = $tag;
entity_create('view', array('tag' => $tag, 'name' => $this->randomName()))->save();
entity_create('view', array('tag' => $tag, 'id' => $this->randomName()))->save();
}
// Make sure just ten results are returns.

6
core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
View File

@ -30,7 +30,7 @@ class ViewStorageTest extends ViewUnitTestBase {
'disabled',
'api_version',
'module',
'name',
'id',
'description',
'tag',
'base_table',
@ -158,7 +158,7 @@ class ViewStorageTest extends ViewUnitTestBase {
}
// Check the UUID of the loaded View.
$created->set('name', 'test_view_storage_new');
$created->set('id', 'test_view_storage_new');
$created->save();
$created_loaded = entity_load('view', 'test_view_storage_new');
$this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.');
@ -181,7 +181,7 @@ class ViewStorageTest extends ViewUnitTestBase {
$executable->initDisplay();
$this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
$view->set('name', 'test_view_storage_new_new2');
$view->set('id', 'test_view_storage_new_new2');
$view->save();
$values = config('views.view.test_view_storage_new_new2')->get();

10
core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
View File

@ -31,7 +31,7 @@ class BasicTest extends WizardTestBase {
// Create a simple and not at all useful view.
$view1 = array();
$view1['human_name'] = $this->randomName(16);
$view1['name'] = strtolower($this->randomName(16));
$view1['id'] = strtolower($this->randomName(16));
$view1['description'] = $this->randomName(16);
$view1['page[create]'] = FALSE;
$this->drupalPost('admin/structure/views/add', $view1, t('Save and edit'));
@ -41,7 +41,7 @@ class BasicTest extends WizardTestBase {
$this->assertText($view1['description']);
// @todo For now, clone is being left to config.module to solve.
foreach (array('delete', 'edit') as $operation) {
$this->assertLinkByHref(url('admin/structure/views/view/' . $view1['name'] . '/' . $operation));
$this->assertLinkByHref(url('admin/structure/views/view/' . $view1['id'] . '/' . $operation));
}
// This view should not have a block.
@ -55,7 +55,7 @@ class BasicTest extends WizardTestBase {
// Now create a page with simple node listing and an attached feed.
$view2 = array();
$view2['human_name'] = $this->randomName(16);
$view2['name'] = strtolower($this->randomName(16));
$view2['id'] = strtolower($this->randomName(16));
$view2['description'] = $this->randomName(16);
$view2['page[create]'] = 1;
$view2['page[title]'] = $this->randomName(16);
@ -97,7 +97,7 @@ class BasicTest extends WizardTestBase {
// Create a view with a page and a block, and filter the listing.
$view3 = array();
$view3['human_name'] = $this->randomName(16);
$view3['name'] = strtolower($this->randomName(16));
$view3['id'] = strtolower($this->randomName(16));
$view3['description'] = $this->randomName(16);
$view3['show[wizard_key]'] = 'node';
$view3['show[type]'] = 'page';
@ -127,7 +127,7 @@ class BasicTest extends WizardTestBase {
$this->assertText('View: ' . $view3['human_name']);
// Place the block.
$this->drupalPlaceBlock("views_block:{$view3['name']}-block_1");
$this->drupalPlaceBlock("views_block:{$view3['id']}-block_1");
// Visit a random page (not the one that displays the view itself) and look
// for the expected node title in the block.

4
core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
View File

@ -41,7 +41,7 @@ class ItemsPerPageTest extends WizardTestBase {
// 3 in the block.
$view = array();
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['description'] = $this->randomName(16);
$view['show[wizard_key]'] = 'node';
$view['show[type]'] = 'article';
@ -79,7 +79,7 @@ class ItemsPerPageTest extends WizardTestBase {
$this->assertText('View: ' . $view['human_name']);
// Place the block, visit a page that displays the block, and check that the
// nodes we expect appear in the correct order.
$this->drupalPlaceBlock("views_block:{$view['name']}-block_1");
$this->drupalPlaceBlock("views_block:{$view['id']}-block_1");
$this->drupalGet('user');
$content = $this->drupalGetContent();

2
core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
View File

@ -27,7 +27,7 @@ class MenuTest extends WizardTestBase {
// Create a view with a page display and a menu link in the Main Menu.
$view = array();
$view['human_name'] = $this->randomName(16);
$view['name'] = strtolower($this->randomName(16));
$view['id'] = strtolower($this->randomName(16));
$view['description'] = $this->randomName(16);
$view['page[create]'] = 1;
$view['page[title]'] = $this->randomName(16);

4
core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
View File

@ -33,7 +33,7 @@ class SortingTest extends WizardTestBase {
// Create a view that sorts oldest first.
$view1 = array();
$view1['human_name'] = $this->randomName(16);
$view1['name'] = strtolower($this->randomName(16));
$view1['id'] = strtolower($this->randomName(16));
$view1['description'] = $this->randomName(16);
$view1['show[sort]'] = 'created:ASC';
$view1['page[create]'] = 1;
@ -58,7 +58,7 @@ class SortingTest extends WizardTestBase {
// Create a view that sorts newest first.
$view2 = array();
$view2['human_name'] = $this->randomName(16);
$view2['name'] = strtolower($this->randomName(16));
$view2['id'] = strtolower($this->randomName(16));
$view2['description'] = $this->randomName(16);
$view2['show[sort]'] = 'created:DESC';
$view2['page[create]'] = 1;

4
core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
View File

@ -125,7 +125,7 @@ class TaggedWithTest extends WizardTestBase {
$this->drupalPost('admin/structure/views/add', $view1, t('Update "of type" choice'));
// Now resubmit the entire form to the same URL.
$view1['human_name'] = $this->randomName(16);
$view1['name'] = strtolower($this->randomName(16));
$view1['id'] = strtolower($this->randomName(16));
$view1['description'] = $this->randomName(16);
$view1['show[tagged_with]'] = 'tag1';
$view1['page[create]'] = 1;
@ -147,7 +147,7 @@ class TaggedWithTest extends WizardTestBase {
$this->drupalPost('admin/structure/views/add', $view2, t('Update "of type" choice'));
$this->assertResponse(200);
$view2['human_name'] = $this->randomName(16);
$view2['name'] = strtolower($this->randomName(16));
$view2['id'] = strtolower($this->randomName(16));
$view2['description'] = $this->randomName(16);
$view2['show[tagged_with]'] = 'tag2';
$view2['page[create]'] = 1;

6
core/modules/views/lib/Drupal/views/ViewExecutable.php
View File

@ -572,8 +572,8 @@ class ViewExecutable {
// remember settings.
$display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display;
if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->get('name')][$display_id])) {
$this->exposed_input = $_SESSION['views'][$this->storage->get('name')][$display_id];
if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->id()][$display_id])) {
$this->exposed_input = $_SESSION['views'][$this->storage->id()][$display_id];
}
}
@ -1415,7 +1415,7 @@ class ViewExecutable {
}
// Allow hook_views_pre_view() to set the dom_id, then ensure it is set.
$this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->get('name') . REQUEST_TIME . mt_rand());
$this->dom_id = !empty($this->dom_id) ? $this->dom_id : hash('sha256', $this->storage->id() . REQUEST_TIME . mt_rand());
// Allow the display handler to set up for execution
$this->display_handler->preExecute();

2
core/modules/views/tests/views_test_config/test_views/views.view.test_access_dynamic.yml
View File

@ -30,5 +30,5 @@ display:
id: page_1
position: '0'
human_name: ''
name: test_access_dynamic
id: test_access_dynamic
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_access_none.yml
View File

@ -23,5 +23,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_access_none
id: test_access_none
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_access_static.yml
View File

@ -30,5 +30,5 @@ display:
id: page_1
position: '0'
human_name: ''
name: test_access_static
id: test_access_static
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_aggregate_count.yml
View File

@ -53,5 +53,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_aggregate_count
id: test_aggregate_count
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_alias.yml
View File

@ -83,6 +83,6 @@ display:
position: '0'
human_name: test_alias
module: views
name: test_alias
id: test_alias
tag: default
uuid: 3bdfd3e6-15aa-4324-9005-5ad8b321d265

2
core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_current_user.yml
View File

@ -49,5 +49,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_argument_default_current_user
id: test_argument_default_current_user
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_argument_default_fixed.yml
View File

@ -52,5 +52,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_argument_default_fixed
id: test_argument_default_fixed
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_attachment_ui.yml
View File

@ -64,5 +64,5 @@ display:
guid_field_is_permalink: '0'
path: test_attachment_ui_feed
position: '3'
name: test_attachment_ui
id: test_attachment_ui
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_cache.yml
View File

@ -37,6 +37,6 @@ display:
field: id
relationship: none
human_name: ''
name: test_cache
id: test_cache
tag: ''
base_field: nid

2
core/modules/views/tests/views_test_config/test_views/views.view.test_click_sort.yml
View File

@ -48,5 +48,5 @@ display:
id: page_1
position: '0'
human_name: { }
name: test_click_sort
id: test_click_sort
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
View File

@ -156,5 +156,5 @@ display:
id: page_1
position: '0'
human_name: ''
name: test_destroy
id: test_destroy
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_display.yml
View File

@ -83,5 +83,5 @@ display:
id: page_1
position: '1'
human_name: ''
name: test_display
id: test_display
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_display_attachment.yml
View File

@ -63,5 +63,5 @@ display:
page_1: page_1
human_name: test_display_attachment
module: views
name: test_display_attachment
id: test_display_attachment
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_dropbutton.yml
View File

@ -223,5 +223,5 @@ display:
link_to_node: '0'
human_name: test_dropbutton
module: views
name: test_dropbutton
id: test_dropbutton
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_example_area.yml
View File

@ -30,5 +30,5 @@ display:
id: default
position: '0'
human_name: { }
name: test_example_area
id: test_example_area
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_executable_displays.yml
View File

@ -20,5 +20,5 @@ display:
id: page_2
position: '2'
human_name: ''
name: test_executable_displays
id: test_executable_displays
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_admin_ui.yml
View File

@ -49,5 +49,5 @@ display:
id: page_1
position: '0'
human_name: ''
name: test_exposed_admin_ui
id: test_exposed_admin_ui
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_exposed_form.yml
View File

@ -23,5 +23,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_exposed_form
id: test_exposed_form
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_feed_display.yml
View File

@ -87,5 +87,5 @@ display:
position: '0'
human_name: test_feed_display
module: views
name: test_feed_display
id: test_feed_display
tag: default

2
core/modules/views/tests/views_test_config/test_views/views.view.test_field_classes.yml
View File

@ -29,5 +29,5 @@ display:
id: page_1
position: '0'
human_name: { }
name: test_field_classes
id: test_field_classes
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_field_get_entity.yml
View File

@ -60,5 +60,5 @@ display:
id: default
position: '0'
human_name: test_field_get_entity
name: test_field_get_entity
id: test_field_get_entity
tag: default

2
core/modules/views/tests/views_test_config/test_views/views.view.test_field_output.yml
View File

@ -22,5 +22,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_field_output
id: test_field_output
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_field_tokens.yml
View File

@ -41,5 +41,5 @@ display:
display_title: Defaults
id: default
position: '0'
name: test_field_tokens
id: test_field_tokens
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_field_type.yml
View File

@ -16,5 +16,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_field_type
id: test_field_type
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_filter.yml
View File

@ -37,4 +37,4 @@ display:
id: default
position: '0'
human_name: 'Test filters'
name: test_filter
id: test_filter

2
core/modules/views/tests/views_test_config/test_views/views.view.test_filter_date_between.yml
View File

@ -37,5 +37,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_filter_date_between
id: test_filter_date_between
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_filter_group_override.yml
View File

@ -50,5 +50,5 @@ display:
id: page_1
position: '0'
human_name: test_filter_group_override
name: test_filter_group_override
id: test_filter_group_override
tag: default

2
core/modules/views/tests/views_test_config/test_views/views.view.test_filter_groups.yml
View File

@ -107,5 +107,5 @@ display:
id: page
position: '0'
human_name: test_filter_groups
name: test_filter_groups
id: test_filter_groups
tag: default

2
core/modules/views/tests/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml
View File

@ -35,5 +35,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_filter_in_operator_ui
id: test_filter_in_operator_ui
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_get_attach_displays.yml
View File

@ -1,5 +1,5 @@
base_table: node
name: test_get_attach_displays
id: test_get_attach_displays
description: ''
tag: ''
human_name: test_get_attach_displays

2
core/modules/views/tests/views_test_config/test_views/views.view.test_glossary.yml
View File

@ -44,5 +44,5 @@ display:
id: default
position: '0'
human_name: test_glossary
name: test_glossary
id: test_glossary
tag: default

2
core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_count.yml
View File

@ -56,5 +56,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_group_by_count
id: test_group_by_count
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_group_by_in_filters.yml
View File

@ -49,5 +49,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_group_by_in_filters
id: test_group_by_in_filters
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_handler_relationships.yml
View File

@ -26,5 +26,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_handler_relationships
id: test_handler_relationships
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_handler_test_access.yml
View File

@ -44,4 +44,4 @@ display:
display_title: Master
id: default
position: '0'
name: test_handler_test_access
id: test_handler_test_access

2
core/modules/views/tests/views_test_config/test_views/views.view.test_history.yml
View File

@ -204,5 +204,5 @@ display:
1: AND
human_name: test_history
module: views
name: test_history
id: test_history
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
View File

@ -29,5 +29,5 @@ display:
id: page_2
position: '0'
human_name: ''
name: test_page_display
id: test_page_display
tag: ''

2
core/modules/views/tests/views_test_config/test_views/views.view.test_pager_full.yml
View File

@ -27,5 +27,5 @@ display:
id: default
position: '0'
human_name: ''
name: test_pager_full
id: test_pager_full
tag: ''

Some files were not shown because too many files have changed in this diff Show More