Skip to content

Commit b25d573

Browse files
slopukhovslopukhov
committed
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-66077
2 parents dd9a4f0 + a5ad3f4 commit b25d573

File tree

565 files changed

+10745
-2616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

565 files changed

+10745
-2616
lines changed

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<!--- Provide a description of the changes proposed in the pull request -->
55

66
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant -->
8-
1. magento/magetno2#<issue_number>: Issue title
7+
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8+
1. magento/magento2#<issue_number>: Issue title
99
2. ...
1010

1111
### Manual testing scenarios

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
22
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
3+
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
34
<h2>Welcome</h2>
45
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
56

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
name="notification_window"
1818
as="notification_window"
1919
acl="Magento_AdminNotification::show_toolbar"
20-
template="notification/window.phtml"/>
20+
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">
23-
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="toolbar_entry.phtml"/>
23+
<block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
2424
</referenceContainer>
2525
</body>
2626
</page>

‎app/code/Magento/Authorizenet/etc/di.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,23 @@
2626
</argument>
2727
</arguments>
2828
</type>
29+
<type name="Magento\Config\Model\Config\TypePool">
30+
<arguments>
31+
<argument name="sensitive" xsi:type="array">
32+
<item name="payment/authorizenet_directpost/login" xsi:type="string">1</item>
33+
<item name="payment/authorizenet_directpost/trans_key" xsi:type="string">1</item>
34+
<item name="payment/authorizenet_directpost/trans_md5" xsi:type="string">1</item>
35+
<item name="payment/authorizenet_directpost/merchant_email" xsi:type="string">1</item>
36+
<item name="payment/authorizenet_directpost/cgi_url" xsi:type="string">1</item>
37+
<item name="payment/authorizenet_directpost/cgi_url_td" xsi:type="string">1</item>
38+
<item name="payment/authorizenet_directpost/email_customer" xsi:type="string">1</item>
39+
</argument>
40+
<argument name="environment" xsi:type="array">
41+
<item name="payment/authorizenet_directpost/cgi_url" xsi:type="string">1</item>
42+
<item name="payment/authorizenet_directpost/cgi_url_td" xsi:type="string">1</item>
43+
<item name="payment/authorizenet_directpost/debug" xsi:type="string">1</item>
44+
<item name="payment/authorizenet_directpost/test" xsi:type="string">1</item>
45+
</argument>
46+
</arguments>
47+
</type>
2948
</config>

‎app/code/Magento/Backend/Block/AnchorRenderer.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ public function __construct(
4949
public function renderAnchor($activeItem, Item $menuItem, $level)
5050
{
5151
if ($level == 1 && $menuItem->getUrl() == '#') {
52-
$output = '<strong class="submenu-group-title" role="presentation">'
53-
. '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
54-
. '</strong>';
52+
$output = '';
53+
if ($menuItem->hasChildren()) {
54+
$output = '<strong class="submenu-group-title" role="presentation">'
55+
. '<span>' . $this->escaper->escapeHtml(__($menuItem->getTitle())) . '</span>'
56+
. '</strong>';
57+
}
5558
} else {
5659
$target = $menuItem->getTarget() ? ('target=' . $menuItem->getTarget()) : '';
5760
$output = '<a href="' . $menuItem->getUrl() . '" ' . $target . ' ' . $this->_renderItemAnchorTitle(

‎app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,18 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
121121
]
122122
);
123123

124+
$fieldset->addField(
125+
'group_code',
126+
'text',
127+
[
128+
'name' => 'group[code]',
129+
'label' => __('Code'),
130+
'value' => $groupModel->getCode(),
131+
'required' => true,
132+
'disabled' => $groupModel->isReadOnly()
133+
]
134+
);
135+
124136
$categories = $this->_category->toOptionArray();
125137

126138
$fieldset->addField(

‎app/code/Magento/Backend/Test/Unit/Block/AnchorRendererTest.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ protected function setUp()
5151
$this->menuItemMock = $this->getMockBuilder(Item::class)
5252
->disableOriginalConstructor()
5353
->getMock();
54+
$this->menuItemWithoutChildrenMock = $this->getMockBuilder(Item::class)
55+
->disableOriginalConstructor()
56+
->getMock();
5457
$this->menuItemCheckerMock = $this->getMockBuilder(MenuItemChecker::class)
5558
->disableOriginalConstructor()
5659
->getMock();
@@ -74,6 +77,7 @@ public function testRenderAnchorLevelIsOne()
7477
$html = 'Test html';
7578
$this->menuItemMock->expects($this->once())->method('getUrl')->willReturn('#');
7679
$this->menuItemMock->expects($this->once())->method('getTitle')->willReturn($title);
80+
$this->menuItemMock->expects($this->once())->method('hasChildren')->willReturn(true);
7781
$this->escaperMock->expects($this->once())->method('escapeHtml')->with(__($title))->willReturn($html);
7882

7983
$expected = '<strong class="submenu-group-title" role="presentation">'
@@ -86,6 +90,19 @@ public function testRenderAnchorLevelIsOne()
8690
);
8791
}
8892

93+
public function testRenderAnchorWithoutChildrenAndLevelIsOne()
94+
{
95+
$this->menuItemWithoutChildrenMock->expects($this->once())->method('getUrl')->willReturn('#');
96+
$this->menuItemWithoutChildrenMock->expects($this->once())->method('hasChildren')->willReturn(false);
97+
98+
$expected = '';
99+
100+
$this->assertEquals(
101+
$expected,
102+
$this->anchorRenderer->renderAnchor($this->activeMenuItemMock, $this->menuItemWithoutChildrenMock, 1)
103+
);
104+
}
105+
89106
/**
90107
* @param bool $hasTarget
91108
* @dataProvider targetDataProvider

‎app/code/Magento/Backend/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",
99
"magento/module-eav": "100.2.*",
10-
"magento/module-theme": "100.2.*",
1110
"magento/module-reports": "100.2.*",
1211
"magento/module-sales": "100.2.*",
1312
"magento/module-quote": "100.2.*",
@@ -21,6 +20,9 @@
2120
"magento/module-config": "100.2.*",
2221
"magento/framework": "100.2.*"
2322
},
23+
"suggest": {
24+
"magento/module-theme": "100.2.*"
25+
},
2426
"type": "magento2-module",
2527
"version": "100.2.0-dev",
2628
"license": [

‎app/code/Magento/Backend/etc/di.xml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
</argument>
2727
</arguments>
2828
</type>
29-
<type name="Magento\Backend\App\Router">
30-
<arguments>
31-
<argument name="routerId" xsi:type="string">admin</argument>
32-
</arguments>
33-
</type>
3429
<type name="Magento\Backend\Model\Menu\Config">
3530
<arguments>
3631
<argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>
@@ -194,6 +189,24 @@
194189
</argument>
195190
</arguments>
196191
</type>
192+
<type name="Magento\Config\Model\Config\TypePool">
193+
<arguments>
194+
<argument name="sensitive" xsi:type="array">
195+
<item name="admin/url/custom" xsi:type="string">1</item>
196+
<item name="admin/url/custom_path" xsi:type="string">1</item>
197+
<item name="trans_email/ident_custom1/email" xsi:type="string">1</item>
198+
<item name="trans_email/ident_custom1/name" xsi:type="string">1</item>
199+
<item name="trans_email/ident_custom2/email" xsi:type="string">1</item>
200+
<item name="trans_email/ident_custom2/name" xsi:type="string">1</item>
201+
<item name="trans_email/ident_general/email" xsi:type="string">1</item>
202+
<item name="trans_email/ident_general/name" xsi:type="string">1</item>
203+
<item name="trans_email/ident_sales/email" xsi:type="string">1</item>
204+
<item name="trans_email/ident_sales/name" xsi:type="string">1</item>
205+
<item name="trans_email/ident_support/email" xsi:type="string">1</item>
206+
<item name="trans_email/ident_support/name" xsi:type="string">1</item>
207+
</argument>
208+
</arguments>
209+
</type>
197210
<type name="Magento\Backend\Model\View\Layout\Filter">
198211
<arguments>
199212
<argument name="filters" xsi:type="array">

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<update handle="admin_login" />
1010
<body>
1111
<referenceContainer name="login.content">
12-
<block class="Magento\Backend\Block\Template" name="admin.login" template="admin/login.phtml">
12+
<block class="Magento\Backend\Block\Template" name="admin.login" template="Magento_Backend::admin/login.phtml">
1313
<container name="form.additional.info" label="Form Additional Info"/>
1414
<container name="form.buttons" label="Form Buttons">
15-
<block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="admin/login_buttons.phtml"/>
15+
<block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="Magento_Backend::admin/login_buttons.phtml"/>
1616
</container>
1717
</block>
1818
</referenceContainer>

0 commit comments

Comments
 (0)