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

Issue #2300347 by vijaycs85, joshi.rohit100 | robertdbailey: Fixed Regression: checkbox to enable translation for users does not save.

8.0.x
Alex Pott 2014-07-25 11:27:36 +01:00
parent f0c9d009a3
commit 4e847383cb
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
View File

@ -36,7 +36,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
$this->container->get('comment.manager')->addDefaultField('node', 'article', 'comment_article', CommentItemInterface::OPEN, 'comment_article');
$this->container->get('comment.manager')->addDefaultField('node', 'page', 'comment_page');
$admin_user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types'));
$admin_user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types', 'administer node fields', 'administer comment fields', 'administer comments', 'administer comment types', 'administer account settings'));
$this->drupalLogin($admin_user);
}
@ -183,6 +183,23 @@ class ContentTranslationSettingsTest extends WebTestBase {
}
}
/**
* Tests the language settings checkbox on account settings page.
*/
function testAccountLanguageSettingsUI() {
// Make sure the checkbox is available and not checked by default.
$this->drupalGet('admin/config/people/accounts');
$this->assertField('language[content_translation]');
$this->assertNoFieldChecked('edit-language-content-translation');
$edit = array(
'language[content_translation]' => TRUE,
);
$this->drupalPostForm('admin/config/people/accounts', $edit, t('Save configuration'));
$this->drupalGet('admin/config/people/accounts');
$this->assertFieldChecked('edit-language-content-translation');
}
/**
* Asserts that translatability has the expected value for the given bundle.
*

3
core/modules/user/src/AccountSettingsForm.php
View File

@ -59,6 +59,7 @@ class AccountSettingsForm extends ConfigFormBase {
* Implements \Drupal\Core\Form\FormInterface::buildForm().
*/
public function buildForm(array $form, array &$form_state) {
$form = parent::buildForm($form, $form_state);
$config = $this->config('user.settings');
$mail_config = $this->config('user.mail');
$site_config = $this->config('system.site');
@ -401,7 +402,7 @@ class AccountSettingsForm extends ConfigFormBase {
'#rows' => 3,
);
return parent::buildForm($form, $form_state);
return $form;
}
/**