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

Issue #2303391 by gvso, idebr, AkshayKalose, gaurav_varshney, dinarcon, kporras07, vaibhavjain, msound, alexpott: Tab 'Log in' shows on 'Request new password page for logged-in users and is missing for logged-out users

8.0.x
webchick 2015-01-17 22:19:21 -08:00
parent cf7565d75e
commit 5726f6edb2
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
View File

@ -47,13 +47,10 @@ class UserLocalTasksTest extends LocalTaskIntegrationTest {
* *
* @dataProvider getUserLoginRoutes * @dataProvider getUserLoginRoutes
*/ */
public function testUserLoginLocalTasks($route, $subtask = array()) { public function testUserLoginLocalTasks($route) {
$tasks = array( $tasks = array(
0 => array('user.page', 'user.register', 'user.pass',), 0 => array('user.register', 'user.pass', 'user.login',),
); );
if ($subtask) {
$tasks[] = $subtask;
}
$this->assertLocalTasks($route, $tasks); $this->assertLocalTasks($route, $tasks);
} }
@ -62,8 +59,7 @@ class UserLocalTasksTest extends LocalTaskIntegrationTest {
*/ */
public function getUserLoginRoutes() { public function getUserLoginRoutes() {
return array( return array(
array('user.page', array('user.login',)), array('user.login'),
array('user.login', array('user.login',)),
array('user.register'), array('user.register'),
array('user.pass'), array('user.pass'),
); );

13
core/modules/user/user.links.task.yml
View File

@ -1,4 +1,3 @@
entity.user_role.edit_form: entity.user_role.edit_form:
title: 'Edit' title: 'Edit'
route_name: entity.user_role.edit_form route_name: entity.user_role.edit_form
@ -9,24 +8,22 @@ user.account_settings_tab:
title: 'Settings' title: 'Settings'
base_route: entity.user.admin_form base_route: entity.user.admin_form
user.page:
route_name: user.page
base_route: user.page
title: 'Log in'
weight: -10
user.register: user.register:
route_name: user.register route_name: user.register
base_route: user.page base_route: user.page
title: 'Create new account' title: 'Create new account'
user.pass: user.pass:
route_name: user.pass route_name: user.pass
base_route: user.page base_route: user.page
title: 'Reset your password' title: 'Reset your password'
# Other authentication methods may add pages below user/login/. # Other authentication methods may add pages below user/login/.
user.login: user.login:
route_name: user.login route_name: user.login
parent_id: user.page base_route: user.page
title: 'Username and password' title: 'Log in'
weight: -10
entity.user.canonical: entity.user.canonical:
route_name: entity.user.canonical route_name: entity.user.canonical