diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc index b3bcda1..c3b8d8b 100644 --- a/core/modules/views/views_ui/admin.inc +++ b/core/modules/views/views_ui/admin.inc @@ -664,7 +664,7 @@ function views_ui_edit_details_form($form, &$form_state) { '#type' => 'textfield', '#title' => t('Human-readable name'), '#description' => t('A descriptive human-readable name for this view. Spaces are allowed'), - '#default_value' => $view->getHumanName(), + '#default_value' => $view->label(), ); $form['details']['tag'] = array( '#type' => 'textfield', @@ -697,7 +697,7 @@ function views_ui_edit_details_form_submit($form, &$form_state) { } } $bases = drupal_container()->get('views.views_data')->fetchBaseTables(); - $form_state['#page_title'] = $view->getHumanName(); + $form_state['#page_title'] = $view->label(); if (isset($bases[$view->get('base_table')])) { $form_state['#page_title'] .= ' (' . $bases[$view->get('base_table')]['title'] . ')'; } diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Routing/ViewsUIController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Routing/ViewsUIController.php index c0fbf9e..d16ba2c 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/Routing/ViewsUIController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Routing/ViewsUIController.php @@ -229,7 +229,7 @@ public function ajaxOperation(ViewStorageInterface $view, $op, Request $request) * The Views clone form. */ public function cloneForm(ViewStorageInterface $view) { - drupal_set_title(t('Clone of @human_name', array('@human_name' => $view->getHumanName()))); + drupal_set_title(t('Clone of @human_name', array('@human_name' => $view->label()))); return entity_get_form($view, 'clone'); } @@ -288,7 +288,7 @@ public function autocompleteTag(Request $request) { public function edit(ViewStorageInterface $view, $display_id = NULL) { $view_ui = $this->getViewUI($view); - $name = $view_ui->getHumanName(); + $name = $view_ui->label(); $data = $this->viewsData->get($view_ui->get('base_table')); if (isset($data['table']['base']['title'])) { $name .= ' (' . $data['table']['base']['title'] . ')'; diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php index dcf319a..e5e8b83 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php @@ -34,7 +34,7 @@ public function form(array $form, array &$form_state, EntityInterface $entity) { '#size' => 32, '#default_value' => '', '#maxlength' => 255, - '#default_value' => t('Clone of @human_name', array('@human_name' => $entity->getHumanName())), + '#default_value' => t('Clone of @human_name', array('@human_name' => $entity->label())), ); $form['id'] = array( '#type' => 'machine_name', diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php index c46de11..5541378 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php @@ -275,7 +275,7 @@ public function submit(array $form, array &$form_state) { } $view->save(); - drupal_set_message(t('The view %name has been saved.', array('%name' => $view->getHumanName()))); + drupal_set_message(t('The view %name has been saved.', array('%name' => $view->label()))); // Remove this view from cache so we can edit it properly. drupal_container()->get('user.tempstore')->get('views')->delete($view->id()); diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module index 24d54ef..a1e99a2 100644 --- a/core/modules/views/views_ui/views_ui.module +++ b/core/modules/views/views_ui/views_ui.module @@ -501,7 +501,7 @@ function views_ui_load($name) { function views_ui_confirm_delete($form, &$form_state, ViewStorageInterface $view) { $form['view'] = array('#type' => 'value', '#value' => $view); return confirm_form($form, - t('Are you sure you want to delete the %name view?', array('%name' => $view->getHumanName())), + t('Are you sure you want to delete the %name view?', array('%name' => $view->label())), 'admin/structure/views', t('This action cannot be undone.'), t('Delete'), diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc index 176955f..dadfbee 100644 --- a/core/modules/views/views_ui/views_ui.theme.inc +++ b/core/modules/views/views_ui/views_ui.theme.inc @@ -58,7 +58,7 @@ function template_preprocess_views_ui_display_tab_bucket(&$variables) { * Implements hook_preprocess_HOOK() for theme_views_ui_view_info(). */ function template_preprocess_views_ui_view_info(&$variables) { - $variables['title'] = $variables['view']->getHumanName(); + $variables['title'] = $variables['view']->label(); $displays = $variables['view']->getDisplaysList(); $variables['displays'] = empty($displays) ? t('None') : format_plural(count($displays), 'Display', 'Displays') . ': ' . '' . implode(', ', $displays) . '';