Skip to content

Commit 9f8fd95

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32315: Side Panels
- Fixed integration test & CR Minor
1 parent 1f35134 commit 9f8fd95

File tree

3 files changed

+5
-10
lines changed
  • app/code/Magento/Backend/view/adminhtml/templates/widget
  • dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System
  • lib/web/mage/backend

3 files changed

+5
-10
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
2828

2929
<li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?php echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
30-
<a href="<?php echo $_tabHref ?>"
31-
id="<?php echo $block->getTabId($_tab) ?>"
32-
name="<?php echo $block->getTabId($_tab, false) ?>"
33-
title="<?php echo $block->getTabTitle($_tab) ?>"
30+
<a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>"
3431
class="admin__page-nav-link <?php echo $_tabClass;?>"
3532
data-tab-type="<?php echo $_tabType;?>"
3633
<?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>

dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ConfigTest extends \Magento\Backend\Utility\Controller
1818
public function testEditAction()
1919
{
2020
$this->dispatch('backend/admin/system_config/edit');
21-
$this->assertContains('<ul id="system_config_tabs"', $this->getResponse()->getBody());
21+
$this->assertContains('<div id="system_config_tabs"', $this->getResponse()->getBody());
2222
}
2323

2424
/**

lib/web/mage/backend/tabs.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,9 @@
302302
.find('.admin__page-nav-item-messages')
303303
.clone()
304304
.appendTo(curItemMessages);
305-
306-
curItemMessage = curItemMessages.find('.'+messageType).addClass(activeClass);
307-
} else {
308-
curItemMessage = curItemMessages.find('.'+messageType).addClass(activeClass);
309305
}
306+
307+
curItemMessage = curItemMessages.find('.'+messageType).addClass(activeClass);
310308
},
311309

312310
/**
@@ -317,7 +315,7 @@
317315
_onInvalid: function(e) {
318316
var cssError = '_error';
319317

320-
this.anchors.eq(e.data.index).addClass(cssError).find(cssError).show();
318+
this.anchors.eq(e.data.index).addClass(cssError).find('.'+cssError).show();
321319
this._updateNavTitleMessages(e, cssError);
322320
},
323321

0 commit comments

Comments
 (0)