Skip to content
Snippets Groups Projects
Commit 33366362 authored by catch's avatar catch
Browse files

Issue #3033904 by murilohp, stefan.korn, smustgrave: Hide empty description...

Issue #3033904 by murilohp, stefan.korn, smustgrave: Hide empty description for an administrative block
parent 652709e4
Branches
Tags
32 merge requests!12227Issue #3181946 by jonmcl, mglaman,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!213Issue #2906496: Give Media a menu item under Content,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
...@@ -29,7 +29,7 @@ function template_preprocess_admin_block_content(&$variables) { ...@@ -29,7 +29,7 @@ function template_preprocess_admin_block_content(&$variables) {
$variables['compact'] = system_admin_compact_mode(); $variables['compact'] = system_admin_compact_mode();
foreach ($variables['content'] as $key => $item) { foreach ($variables['content'] as $key => $item) {
$variables['content'][$key]['link'] = Link::fromTextAndUrl($item['title'], $item['url'])->toString(); $variables['content'][$key]['link'] = Link::fromTextAndUrl($item['title'], $item['url'])->toString();
if (!$variables['compact'] && isset($item['description'])) { if (!$variables['compact'] && !empty($item['description'])) {
$variables['content'][$key]['description'] = ['#markup' => $item['description']]; $variables['content'][$key]['description'] = ['#markup' => $item['description']];
} }
else { else {
......
...@@ -89,3 +89,8 @@ menu_test.access_check: ...@@ -89,3 +89,8 @@ menu_test.access_check:
title: 'Test custom route access check' title: 'Test custom route access check'
route_name: menu_test.router_test_session route_name: menu_test.router_test_session
menu_name: account menu_name: account
menu_test.admin_description:
title: 'Test custom admin block without description'
parent: system.admin_config_content
route_name: menu_test.menu_name_test
...@@ -31,7 +31,7 @@ class AdminTest extends BrowserTestBase { ...@@ -31,7 +31,7 @@ class AdminTest extends BrowserTestBase {
* *
* @var array * @var array
*/ */
protected static $modules = ['locale']; protected static $modules = ['locale', 'menu_test'];
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -182,4 +182,17 @@ public function testCompactMode() { ...@@ -182,4 +182,17 @@ public function testCompactMode() {
$this->assertNull($session->getCookie('Drupal.visitor.admin_compact_mode'), 'Compact mode persists off new requests.'); $this->assertNull($session->getCookie('Drupal.visitor.admin_compact_mode'), 'Compact mode persists off new requests.');
} }
/**
* Tests admin config page blocks without descriptions.
*/
public function testConfigBlocksDescription(): void {
// Go to Config administration page.
$this->drupalGet('admin/config');
$this->assertSession()->statusCodeEquals(200);
// Validates the custom block without description.
$this->assertSession()->pageTextContains('Test custom admin block without description');
// Validates an empty description block.
$this->assertSession()->elementNotExists('xpath', '//dd[@class="list-group__description"][not(text())]');
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment