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

Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023

Browse source
This commit is contained in:
Pantheon Automation 2015-09-04 13:20:09 -07:00 • committed by Greg Anderson
parent 2720a9ec4b
commit f3791f1da3
1898 changed files with 54300 additions and 11481 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/modules/config_translation/src/Controller/ConfigTranslationBlockListBuilder.php
View file

@ -7,7 +7,6 @@
namespace Drupal\config_translation\Controller;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeInterface;
@ -65,17 +64,17 @@ class ConfigTranslationBlockListBuilder extends ConfigTranslationEntityListBuild
$plugin_definition = $entity->getPlugin()->getPluginDefinition();
$row['label'] = array(
'data' => $this->getLabel($entity),
'data' => $entity->label(),
'class' => 'table-filter-text-source',
);
$row['theme'] = array(
'data' => SafeMarkup::checkPlain($this->themes[$theme]->info['name']),
'data' => $this->themes[$theme]->info['name'],
'class' => 'table-filter-text-source',
);
$row['category'] = array(
'data' => SafeMarkup::checkPlain($plugin_definition['category']),
'data' => $plugin_definition['category'],
'class' => 'table-filter-text-source',
);

2
core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
View file

@ -68,7 +68,7 @@ class ConfigTranslationEntityListBuilder extends ConfigEntityListBuilder impleme
* {@inheritdoc}
*/
public function buildRow(EntityInterface $entity) {
$row['label']['data'] = $this->getLabel($entity);
$row['label']['data'] = $entity->label();
$row['label']['class'][] = 'table-filter-text-source';
return $row + parent::buildRow($entity);
}

5
core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
View file

@ -7,7 +7,6 @@
namespace Drupal\config_translation\Controller;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
@ -116,14 +115,14 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
*/
public function buildRow(EntityInterface $entity) {
$row['label'] = array(
'data' => $this->getLabel($entity),
'data' => $entity->label(),
'class' => 'table-filter-text-source',
);
if ($this->displayBundle()) {
$bundle = $entity->get('bundle');
$row['bundle'] = array(
'data' => SafeMarkup::checkPlain($this->baseEntityBundles[$bundle]['label']),
'data' => $this->baseEntityBundles[$bundle]['label'],
'class' => 'table-filter-text-source',
);
}

3
core/modules/config_translation/src/Controller/ConfigTranslationMapperList.php
View file

@ -7,7 +7,6 @@
namespace Drupal\config_translation\Controller;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\config_translation\ConfigMapperInterface;
use Drupal\Core\Controller\ControllerBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -94,7 +93,7 @@ class ConfigTranslationMapperList extends ControllerBase {
* A render array structure of fields for this mapper.
*/
public function buildRow(ConfigMapperInterface $mapper) {
$row['label'] = SafeMarkup::checkPlain($mapper->getTypeLabel());
$row['label'] = $mapper->getTypeLabel();
$row['operations']['data'] = $this->buildOperations($mapper);
return $row;
}