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

Issue #2255369 by larowlan, Xano: DialogController does not respect ['#title'] for the page title.

8.0.x
Nathaniel Catchpole 2014-05-09 10:50:39 +01:00
parent 209ef5e8c7
commit 4b68f9afe4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Controller/DialogController.php
View File

@ -93,7 +93,7 @@ class DialogController {
}
$content = drupal_render($page_content);
$title = $this->titleResolver->getTitle($request, $request->attributes->get(RouteObjectInterface::ROUTE_OBJECT));
$title = isset($page_content['#title']) ? $page_content['#title'] : $this->titleResolver->getTitle($request, $request->attributes->get(RouteObjectInterface::ROUTE_OBJECT));
$response = new AjaxResponse();
// Fetch any modal options passed in from data-dialog-options.
$options = $request->request->get('dialogOptions', array());

1
core/modules/system/tests/modules/ajax_test/ajax_test.module
View File

@ -95,6 +95,7 @@ function ajax_test_error() {
function ajax_test_dialog_contents() {
// This is a regular render array; the keys do not have special meaning.
$content = array(
'#title' => 'AJAX Dialog contents',
'content' => array(
'#markup' => 'Example message',
),

2
core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml
View File

@ -1,7 +1,7 @@
ajax_test.dialog_contents:
path: '/ajax-test/dialog-contents'
defaults:
_title: 'AJAX Dialog contents'
_title: 'AJAX Dialog contents routing'
_content: '\Drupal\ajax_test\Controller\AjaxTestController::dialogContents'
requirements:
_access: 'TRUE'