Skip to content
Snippets Groups Projects
Verified Commit b050dbf4 authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3062376 by smustgrave, rlnorthcutt, Krzysztof Domański, ravi.shankar,...

Issue #3062376 by smustgrave, rlnorthcutt, Krzysztof Domański, ravi.shankar, robpowell, acbramley, Abhijith S, larowlan, Anybody, lauriii, phenaproxima, brandonratz, danflanagan8, quietone, longwave: Template suggestions for custom block view modes
parent f2ba76f1
No related branches found
No related tags found
29 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #107340 passed with warnings
......@@ -5,6 +5,7 @@
* Allows the creation of content blocks through the user interface.
*/
use Drupal\block_content\BlockContentInterface;
use Drupal\Core\Url;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\field\Entity\FieldConfig;
......@@ -183,3 +184,33 @@ function _block_content_has_reusable_condition(array $condition, array $tables)
}
return FALSE;
}
/**
* Implements hook_theme_suggestions_HOOK_alter() for block templates.
*/
function block_content_theme_suggestions_block_alter(array &$suggestions, array $variables) {
$suggestions_new = [];
$content = $variables['elements']['content'];
$block_content = $variables['elements']['content']['#block_content'] ?? NULL;
if ($block_content instanceof BlockContentInterface) {
$bundle = $content['#block_content']->bundle();
$view_mode = strtr($variables['elements']['#configuration']['view_mode'], '.', '_');
$suggestions_new[] = 'block__block_content__view__' . $view_mode;
$suggestions_new[] = 'block__block_content__type__' . $bundle;
$suggestions_new[] = 'block__block_content__view_type__' . $bundle . '__' . $view_mode;
if (!empty($variables['elements']['#id'])) {
$suggestions_new[] = 'block__block_content__id__' . $variables['elements']['#id'];
$suggestions_new[] = 'block__block_content__id_view__' . $variables['elements']['#id'] . '__' . $view_mode;
}
// Remove duplicate block__block_content.
$suggestions = array_unique($suggestions);
array_splice($suggestions, 1, 0, $suggestions_new);
}
return $suggestions;
}
<?php
namespace Drupal\Tests\block_content\Kernel;
use Drupal\block\Entity\Block;
use Drupal\block_content\Entity\BlockContent;
use Drupal\block_content\Entity\BlockContentType;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests the block_content_theme_suggestions_block() function.
*
* @group block_content
*/
class BlockTemplateSuggestionsTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = [
'user',
'block',
'block_content',
'system',
];
/**
* The BlockContent entity used for testing.
*
* @var \Drupal\block_content\Entity\BlockContent
*/
protected $blockContent;
/**
* {@inheritdoc}
*/
protected function setUp(): void {
parent::setUp();
$this->installEntitySchema('block_content');
// Create a block content type.
$block_content_type = BlockContentType::create([
'id' => 'test_block',
'label' => 'A test block type',
'description' => "Provides a test block type.",
]);
$block_content_type->save();
$this->blockContent = BlockContent::create([
'info' => 'The Test Block',
'type' => 'test_block',
]);
$this->blockContent->save();
}
/**
* Tests template suggestions from block_content_theme_suggestions_block().
*/
public function testBlockThemeHookSuggestions() {
// Create a block using a block_content plugin.
$block = Block::create([
'plugin' => 'block_content:' . $this->blockContent->uuid(),
'region' => 'footer',
'id' => 'machine_name',
]);
$variables['elements']['#id'] = $block->id();
$variables['elements']['#configuration']['provider'] = 'block_content';
$variables['elements']['#configuration']['view_mode'] = 'full';
$variables['elements']['content']['#block_content'] = $this->blockContent;
$suggestions_empty = [];
$suggestions_empty[] = 'block__block_content__' . $block->uuid();
$suggestions = block_content_theme_suggestions_block_alter($suggestions_empty, $variables);
$this->assertSame([
'block__block_content__' . $block->uuid(),
'block__block_content__view__full',
'block__block_content__type__test_block',
'block__block_content__view_type__test_block__full',
'block__block_content__id__machine_name',
'block__block_content__id_view__machine_name__full',
], $suggestions);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment