Skip to content

GitLab

D
drupal
Commit 270708d5 authored by alexpott's avatar alexpott
Browse files
Options

Issue #2102125 followup by tim.plunkett, Gábor Hojtsy: Big Local Task Conversion.

parent 2a5f1b9b
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 40 deletions
core/modules/action/tests/Drupal/action/Tests/Menu/ActionLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('action' => 'core/modules/action/action.info.yml');
$this->moduleList = array('action' => 'core/modules/action/action.module');
parent::setUp();
}
......
core/modules/aggregator/tests/Drupal/aggregator/Tests/Menu/AggregatorLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('aggregator' => 'core/modules/aggregator/aggregator.info.yml');
$this->moduleList = array('aggregator' => 'core/modules/aggregator/aggregator.module');
parent::setUp();
}
......
core/modules/block/block.module
View file @ 270708d5
......@@ -5,15 +5,11 @@
* Controls the visual building blocks a page is constructed with.
*/
use Drupal\block\BlockInterface;
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\Component\Utility\NestedArray;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
/**
* Denotes that a block is not enabled in any region and should not be shown.
*/
const BLOCK_REGION_NONE = -1;
/**
* Shows this block on every page except the listed pages.
*/
......@@ -308,15 +304,15 @@ function _block_rehash($theme = NULL) {
$region = $block->get('region');
$status = $block->status();
// Disable blocks in invalid regions.
if (!empty($region) && $region != BLOCK_REGION_NONE && !isset($regions[$region]) && $status) {
if (!empty($region) && $region != BlockInterface::BLOCK_REGION_NONE && !isset($regions[$region]) && $status) {
drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block_id, '%region' => $region)), 'warning');
// Disabled modules are moved into the BLOCK_REGION_NONE later so no
// need to move the block to another region.
// Disabled modules are moved into the BlockInterface::BLOCK_REGION_NONE
// later so no need to move the block to another region.
$block->disable()->save();
}
// Set region to none if not enabled.
if (!$status) {
$block->set('region', BLOCK_REGION_NONE);
$block->set('region', BlockInterface::BLOCK_REGION_NONE);
$block->save();
}
}
......
core/modules/block/custom_block/tests/Drupal/custom_blocks/Tests/Menu/CustomBlockLocalTasksTest.php
View file @ 270708d5
......@@ -27,8 +27,8 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'block' => 'core/modules/block/block.info.yml',
'custom_block' => 'core/modules/block/custom_block/custom_block.info.yml',
'block' => 'core/modules/block/block.module',
'custom_block' => 'core/modules/block/custom_block/custom_block.module',
);
parent::setUp();
}
......
core/modules/block/lib/Drupal/block/BlockFormController.php
View file @ 270708d5
......@@ -259,7 +259,7 @@ public function form(array $form, array &$form_state) {
'#title' => $this->t('Region'),
'#description' => $this->t('Select the region where this block should be displayed.'),
'#default_value' => $entity->get('region'),
'#empty_value' => BLOCK_REGION_NONE,
'#empty_value' => BlockInterface::BLOCK_REGION_NONE,
'#options' => system_region_list($theme, REGIONS_VISIBLE),
'#prefix' => '<div id="edit-block-region-wrapper">',
'#suffix' => '</div>',
......
core/modules/block/lib/Drupal/block/BlockInterface.php
View file @ 270708d5
......@@ -19,6 +19,11 @@ interface BlockInterface extends ConfigEntityInterface {
*/
const BLOCK_LABEL_VISIBLE = 'visible';
/**
* Denotes that a block is not enabled in any region and should not be shown.
*/
const BLOCK_REGION_NONE = -1;
/**
* Returns the plugin instance.
*
......
core/modules/block/lib/Drupal/block/BlockListController.php
View file @ 270708d5
......@@ -155,7 +155,7 @@ public function buildForm(array $form, array &$form_state) {
$form['#attributes']['class'][] = 'clearfix';
// Add a last region for disabled blocks.
$block_regions_with_disabled = $this->regions + array(BLOCK_REGION_NONE => BLOCK_REGION_NONE);
$block_regions_with_disabled = $this->regions + array(BlockInterface::BLOCK_REGION_NONE => BlockInterface::BLOCK_REGION_NONE);
$form['block_regions'] = array(
'#type' => 'value',
'#value' => $block_regions_with_disabled,
......@@ -219,7 +219,7 @@ public function buildForm(array $form, array &$form_state) {
),
);
$form['blocks'][$region]['title'] = array(
'#markup' => $region != BLOCK_REGION_NONE ? $title : t('Disabled'),
'#markup' => $region != BlockInterface::BLOCK_REGION_NONE ? $title : t('Disabled'),
'#wrapper_attributes' => array(
'colspan' => 5,
),
......@@ -263,7 +263,7 @@ public function buildForm(array $form, array &$form_state) {
$form['blocks'][$entity_id]['region-theme']['region'] = array(
'#type' => 'select',
'#default_value' => $region,
'#empty_value' => BLOCK_REGION_NONE,
'#empty_value' => BlockInterface::BLOCK_REGION_NONE,
'#title' => t('Region for @block block', array('@block' => $info['admin_label'])),
'#title_display' => 'invisible',
'#options' => $this->regions,
......@@ -404,7 +404,7 @@ public function submitForm(array &$form, array &$form_state) {
foreach ($entities as $entity_id => $entity) {
$entity->set('weight', $form_state['values']['blocks'][$entity_id]['weight']);
$entity->set('region', $form_state['values']['blocks'][$entity_id]['region']);
if ($entity->get('region') == BLOCK_REGION_NONE) {
if ($entity->get('region') == BlockInterface::BLOCK_REGION_NONE) {
$entity->disable();
}
else {
......
core/modules/block/lib/Drupal/block/Entity/Block.php
View file @ 270708d5
......@@ -71,7 +71,7 @@ class Block extends ConfigEntityBase implements BlockInterface {
*
* @var string
*/
protected $region = BLOCK_REGION_NONE;
protected $region = self::BLOCK_REGION_NONE;
/**
* The block weight.
......@@ -163,7 +163,7 @@ public static function sort($a, $b) {
return $status;
}
// Sort by weight, unless disabled.
if ($a->get('region') != BLOCK_REGION_NONE) {
if ($a->get('region') != static::BLOCK_REGION_NONE) {
$weight = $a->get('weight') - $b->get('weight');
if ($weight) {
return $weight;
......
core/modules/block/tests/Drupal/block/Tests/BlockFormControllerTest.php
View file @ 270708d5
......@@ -10,11 +10,6 @@
use Drupal\block\BlockFormController;
use Drupal\Tests\UnitTestCase;
// @todo Remove once the constants are replaced with constants on classes.
if (!defined('BLOCK_REGION_NONE')) {
define('BLOCK_REGION_NONE', -1);
}
/**
* Tests the block form controller.
*
......
core/modules/block/tests/Drupal/block/Tests/Menu/BlockLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('block' => 'core/modules/block/block.info.yml');
$this->moduleList = array('block' => 'core/modules/block/block.module');
parent::setUp();
$config_factory = $this->getConfigFactoryStub(array('system.theme' => array(
......
core/modules/book/tests/Drupal/book/Tests/Menu/BookLocalTasksTest.php
View file @ 270708d5
......@@ -27,8 +27,8 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'book' => 'core/modules/book/book.info.yml',
'node' => 'core/modules/node/node.info.yml',
'book' => 'core/modules/book/book.module',
'node' => 'core/modules/node/node.module',
);
parent::setUp();
}
......
core/modules/config/tests/Drupal/config/Tests/Menu/ConfigLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('config' => 'core/modules/config/config.info.yml');
$this->moduleList = array('config' => 'core/modules/config/config.module');
parent::setUp();
}
......
core/modules/content_translation/lib/Drupal/content_translation/Plugin/Derivative/ContentTranslationLocalTasks.php
View file @ 270708d5
......@@ -120,15 +120,15 @@ public function alterLocalTasks(array &$local_tasks) {
* Returns the local task ID of the parent task, otherwise return FALSE.
*/
protected function getTaskFromRoute($route_name, &$local_tasks) {
$local_task = FALSE;
$parent_local_task = FALSE;
foreach ($local_tasks as $plugin_id => $local_task) {
if ($local_task['route_name'] == $route_name) {
$local_task = $plugin_id;
$parent_local_task = $plugin_id;
break;
}
}
return $local_task;
return $parent_local_task;
}
/**
......
core/modules/content_translation/tests/Drupal/content_translation/Tests/Menu/ContentTranslationLocalTasksTest.php
View file @ 270708d5
......@@ -27,8 +27,8 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'content_translation' => 'core/modules/content_translation/content_translation.info.yml',
'node' => 'core/modules/node/node.info.yml',
'content_translation' => 'core/modules/content_translation/content_translation.module',
'node' => 'core/modules/node/node.module',
);
parent::setUp();
......
core/modules/language/tests/Drupal/language/Tests/Menu/LanguageLocalTasks.php
View file @ 270708d5
......@@ -27,7 +27,7 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'language' => 'core/modules/language/language.info.yml',
'language' => 'core/modules/language/language.module',
);
parent::setUp();
}
......
core/modules/locale/tests/Drupal/locale/Tests/Menu/LocaleLocalTasksTest.php
View file @ 270708d5
......@@ -27,7 +27,7 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'locale' => 'core/modules/locale/locale.info.yml',
'locale' => 'core/modules/locale/locale.module',
);
parent::setUp();
}
......
core/modules/shortcut/tests/Drupal/shortcut/Tests/Menu/ShortcutLocalTasksTest.php
View file @ 270708d5
......@@ -27,8 +27,8 @@ public static function getInfo() {
public function setUp() {
$this->moduleList = array(
'shortcut' => 'core/modules/shortcut/shortcut.info.yml',
'user' => 'core/modules/user/user.info.yml',
'shortcut' => 'core/modules/shortcut/shortcut.module',
'user' => 'core/modules/user/user.module',
);
parent::setUp();
}
......
core/modules/taxonomy/tests/Drupal/taxonomy/Tests/Menu/TaxonomyLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('taxonomy' => 'core/modules/taxonomy/taxonomy.info.yml');
$this->moduleList = array('taxonomy' => 'core/modules/taxonomy/taxonomy.module');
parent::setUp();
}
......
core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php
View file @ 270708d5
......@@ -26,7 +26,7 @@ public static function getInfo() {
}
public function setUp() {
$this->moduleList = array('user' => 'core/modules/user/user.info.yml');
$this->moduleList = array('user' => 'core/modules/user/user.module');
parent::setUp();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment