Skip to content

Commit 82f5a36

Browse files
author
Viktor Sevch
committed
MC-35166: Admin user and user role pages are loading not correctly
1 parent 6c9cd23 commit 82f5a36

File tree

1 file changed

+17
-7
lines changed
  • app/code/Magento/Backend/view/adminhtml/templates/widget

1 file changed

+17
-7
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
3232
$block->getTabUrl($_tab) ?>
3333

34-
<li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
34+
<li class="admin__page-nav-item no-display" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
3535
<?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
3636
<a href="<?= $block->escapeUrl($_tabHref) ?>"
3737
id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
@@ -72,17 +72,27 @@
7272
<?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
7373
<?= /* @noEscape */ $block->getTabContent($_tab) ?>
7474
</div>
75-
<?php if ($block->getTabIsHidden($_tab)): ?>
76-
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
77-
'display:none',
78-
'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
79-
); ?>
80-
<?php endif; ?>
8175
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
8276
'display:none',
8377
'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
8478
); ?>
8579
</li>
80+
<?php $scriptString = <<<script
81+
require(['jquery'], function($){
82+
'use strict';
83+
script;
84+
if ($block->getTabIsHidden($_tab)):
85+
$scriptString .= <<<script
86+
$('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').css('display', 'none');
87+
script;
88+
endif;
89+
90+
$scriptString .= <<<script
91+
$('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').removeClass('no-display');
92+
})
93+
script;
94+
?>
95+
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
8696
<?php endforeach; ?>
8797
</ul>
8898
</div>

0 commit comments

Comments
 (0)