opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.1. For more information, see https://www.drupal.org/node/2627402

Browse source
This commit is contained in:
Pantheon Automation 2015-12-02 11:38:43 -08:00 • committed by Greg Anderson
parent 013aaaf2ff
commit 1a0e9d9fac
153 changed files with 1268 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/config/src/Form/ConfigSingleExportForm.php
View file

@ -14,6 +14,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormState;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@ -169,8 +170,12 @@ class ConfigSingleExportForm extends FormBase {
$entity_storage = $this->entityManager->getStorage($config_type);
foreach ($entity_storage->loadMultiple() as $entity) {
$entity_id = $entity->id();
$label = $entity->label() ?: $entity_id;
$names[$entity_id] = $label;
if ($label = $entity->label()) {
$names[$entity_id] = new TranslatableMarkup('@label (@id)', ['@label' => $label, '@id' => $entity_id]);
}
else {
$names[$entity_id] = $entity_id;
}
}
}
// Handle simple configuration.

9
core/modules/config/src/Tests/ConfigExportUITest.php
View file

@ -23,7 +23,7 @@ class ConfigExportUITest extends WebTestBase {
*
* @var array
*/
public static $modules = array('config', 'config_test', 'config_export_test');
public static $modules = array('config', 'config_test');
/**
* {@inheritdoc}
@ -31,6 +31,13 @@ class ConfigExportUITest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Set up an override.
$settings['config']['system.maintenance']['message'] = (object) array(
'value' => 'Foo',
'required' => TRUE,
);
$this->writeSettings($settings);
$this->drupalLogin($this->drupalCreateUser(array('export configuration')));
}

2
core/modules/config/src/Tests/ConfigSingleImportExportTest.php
View file

@ -208,7 +208,7 @@ EOD;
$this->assertFieldByXPath('//select[@name="config_type"]//option[@selected="selected"]', t('Date format'), 'The date format entity type is selected when specified in the URL.');
$this->drupalGet('admin/config/development/configuration/single/export/date_format/fallback');
$this->assertFieldByXPath('//select[@name="config_name"]//option[@selected="selected"]', t('Fallback date format'), 'The fallback date format config entity is selected when specified in the URL.');
$this->assertFieldByXPath('//select[@name="config_name"]//option[@selected="selected"]', t('Fallback date format (fallback)'), 'The fallback date format config entity is selected when specified in the URL.');
$fallback_date = \Drupal::entityManager()->getStorage('date_format')->load('fallback');
$data = Yaml::encode($fallback_date->toArray());

5
core/modules/config/tests/config_export_test/config_export_test.info.yml
View file

@ -1,5 +0,0 @@
name: 'Configuration export test'
type: module
package: Testing
version: VERSION
core: 8.x

9
core/modules/config/tests/config_export_test/config_export_test.module
View file

@ -1,9 +0,0 @@
<?php
/**
* @file
* Provides config export testing support functionality.
*/
// Override the system maintenance message for testing.
$GLOBALS['config']['system.maintenance']['message'] = 'Foo';