Skip to content

Commit 5d25cfc

Browse files
author
Stanislav Idolov
committed
Merge remote-tracking branch 'south/MAGETWO-43824' into catalog-promo-interface
Conflicts: app/code/Magento/CatalogRule/Model/Rule/DataProvider.php
2 parents 70ffca9 + 7af7519 commit 5d25cfc

File tree

255 files changed

+3865
-1506
lines changed

Some content is hidden

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

255 files changed

+3865
-1506
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2868,7 +2868,7 @@ Tests:
28682868
* Fixed a 404 error after saving mass update product attributes form
28692869
* Fixed an issue when it was impossible to perform search by all tax classes on the Advanced Search page
28702870
* Fixed an issue when attribute order for configurable product was not preserved after saving product
2871-
* Fixed an issue with no results for the Product Best Sellers report
2871+
* Fixed an issue with no results for the Product Bestsellers report
28722872
* Fixed a fatal error when opening tax configuration page in the backend
28732873
* Fixed an error occurring when opening the Tax Zones and Rates page in the backend
28742874
* Fixed a 404 error occurring while searching products on the New Review page

‎app/code/Magento/AdminNotification/etc/acl.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<resource id="Magento_Backend::admin">
1212
<resource id="Magento_Backend::system">
1313
<resource id="Magento_Backend::system_other_settings">
14-
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
15-
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
16-
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />
17-
<resource id="Magento_AdminNotification::mark_as_read" title="Mark as Read" sortOrder="30" />
18-
<resource id="Magento_AdminNotification::adminnotification_remove" title="Remove" sortOrder="40" />
14+
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" translate="title" sortOrder="10">
15+
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" translate="title" sortOrder="10" />
16+
<resource id="Magento_AdminNotification::show_list" title="Show List" translate="title" sortOrder="20" />
17+
<resource id="Magento_AdminNotification::mark_as_read" title="Mark as Read" translate="title" sortOrder="30" />
18+
<resource id="Magento_AdminNotification::adminnotification_remove" title="Remove" translate="title" sortOrder="40" />
1919
</resource>
2020
</resource>
2121
</resource>

‎app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
10+
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
1111
</menu>
1212
</config>

‎app/code/Magento/Backend/Block/Widget/Tabs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function addTabAfter($tabId, $tab, $afterTabId)
112112
public function addTab($tabId, $tab)
113113
{
114114
if (empty($tabId)) {
115-
throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empry'));
115+
throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
116116
}
117117
if (is_array($tab)) {
118118
$this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
99
<acl>
1010
<resources>
11-
<resource id="Magento_Backend::all" title="Allow everything" sortOrder="10" />
12-
<resource id="Magento_Backend::admin" title="Magento Admin" sortOrder="20">
13-
<resource id="Magento_Backend::dashboard" title="Dashboard" sortOrder="0" />
14-
<resource id="Magento_Backend::global_search" title="Global Search" sortOrder="100" />
15-
<resource id="Magento_Backend::myaccount" title="My Account" sortOrder="50" />
16-
<resource id="Magento_Backend::marketing" title="Marketing" sortOrder="50">
17-
<resource id="Magento_Backend::marketing_seo" title="SEO &amp; Search" sortOrder="40" />
18-
<resource id="Magento_Backend::marketing_user_content" title="User Content" sortOrder="50" />
11+
<resource id="Magento_Backend::all" title="Allow everything" translate="title" sortOrder="10" />
12+
<resource id="Magento_Backend::admin" title="Magento Admin" translate="title" sortOrder="20">
13+
<resource id="Magento_Backend::dashboard" title="Dashboard" translate="title" sortOrder="0" />
14+
<resource id="Magento_Backend::global_search" title="Global Search" translate="title" sortOrder="100" />
15+
<resource id="Magento_Backend::myaccount" title="My Account" translate="title" sortOrder="50" />
16+
<resource id="Magento_Backend::marketing" title="Marketing" translate="title" sortOrder="50">
17+
<resource id="Magento_Backend::marketing_seo" title="SEO &amp; Search" translate="title" sortOrder="40" />
18+
<resource id="Magento_Backend::marketing_user_content" title="User Content" translate="title" sortOrder="50" />
1919
</resource>
20-
<resource id="Magento_Backend::content" title="Content" sortOrder="60">
21-
<resource id="Magento_Backend::content_elements" title="Elements" sortOrder="10" />
22-
<resource id="Magento_Backend::design" title="Design" sortOrder="20">
23-
<resource id="Magento_Backend::schedule" title="Schedule" sortOrder="30" />
20+
<resource id="Magento_Backend::content" title="Content" translate="title" sortOrder="60">
21+
<resource id="Magento_Backend::content_elements" title="Elements" translate="title" sortOrder="10" />
22+
<resource id="Magento_Backend::design" title="Design" translate="title" sortOrder="20">
23+
<resource id="Magento_Backend::schedule" title="Schedule" translate="title" sortOrder="30" />
2424
</resource>
2525
</resource>
26-
<resource id="Magento_Backend::stores" title="Stores" sortOrder="80">
27-
<resource id="Magento_Backend::stores_settings" title="Settings" sortOrder="10">
28-
<resource id="Magento_Backend::store" title="All Stores" sortOrder="10"/>
26+
<resource id="Magento_Backend::stores" title="Stores" translate="title" sortOrder="80">
27+
<resource id="Magento_Backend::stores_settings" title="Settings" translate="title" sortOrder="10">
28+
<resource id="Magento_Backend::store" title="All Stores" translate="title" sortOrder="10"/>
2929
</resource>
30-
<resource id="Magento_Backend::stores_attributes" title="Attributes" sortOrder="40" />
31-
<resource id="Magento_Backend::stores_other_settings" title="Other Settings" sortOrder="50" />
30+
<resource id="Magento_Backend::stores_attributes" title="Attributes" translate="title" sortOrder="40" />
31+
<resource id="Magento_Backend::stores_other_settings" title="Other Settings" translate="title" sortOrder="50" />
3232
</resource>
33-
<resource id="Magento_Backend::system" title="System" sortOrder="90">
34-
<resource id="Magento_Backend::convert" title="Data Transfer" sortOrder="10" />
35-
<resource id="Magento_Backend::extensions" title="Magento Connect" sortOrder="20">
36-
<resource id="Magento_Backend::local" title="Connect Manager" sortOrder="10" />
37-
<resource id="Magento_Backend::custom" title="Package Extensions" sortOrder="20" />
33+
<resource id="Magento_Backend::system" title="System" translate="title" sortOrder="90">
34+
<resource id="Magento_Backend::convert" title="Data Transfer" translate="title" sortOrder="10" />
35+
<resource id="Magento_Backend::extensions" title="Magento Connect" translate="title" sortOrder="20">
36+
<resource id="Magento_Backend::local" title="Connect Manager" translate="title" sortOrder="10" />
37+
<resource id="Magento_Backend::custom" title="Package Extensions" translate="title" sortOrder="20" />
3838
</resource>
39-
<resource id="Magento_Backend::tools" title="Tools" sortOrder="50">
40-
<resource id="Magento_Backend::cache" title="Cache Management" sortOrder="10" />
41-
<resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" sortOrder="20" />
39+
<resource id="Magento_Backend::tools" title="Tools" translate="title" sortOrder="50">
40+
<resource id="Magento_Backend::cache" title="Cache Management" translate="title" sortOrder="10" />
41+
<resource id="Magento_Backend::setup_wizard" title="Web Setup Wizard" translate="title" sortOrder="20" />
4242
</resource>
43-
<resource id="Magento_Backend::system_other_settings" title="Other Settings" sortOrder="80" />
43+
<resource id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" sortOrder="80" />
4444
</resource>
4545
</resource>
4646
</resources>

‎app/code/Magento/Backend/etc/adminhtml/menu.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
11-
<add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
12-
<add id="Magento_Backend::system_store" title="All Stores" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
13-
<add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
14-
<add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
15-
<add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>
16-
<add id="Magento_Backend::system_design" title="Design" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Backend::design"/>
17-
<add id="Magento_Backend::system_convert" title="Data Transfer" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Backend::convert"/>
18-
<add id="Magento_Backend::system_cache" title="Cache Management" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Backend::cache"/>
19-
<add id="Magento_Backend::marketing" title="Marketing" module="Magento_Backend" sortOrder="40" resource="Magento_Backend::marketing"/>
20-
<add id="Magento_Backend::marketing_communications" title="Communications" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_communications"/>
21-
<add id="Magento_Backend::marketing_seo" title="SEO &amp; Search" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_seo"/>
22-
<add id="Magento_Backend::marketing_user_content" title="User Content" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_user_content"/>
23-
<add id="Magento_Backend::content" title="Content" module="Magento_Backend" sortOrder="50" resource="Magento_Backend::content"/>
24-
<add id="Magento_Backend::content_elements" title="Elements" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Backend::content_elements"/>
25-
<add id="Magento_Backend::stores" title="Stores" module="Magento_Backend" sortOrder="70" resource="Magento_Backend::stores"/>
26-
<add id="Magento_Backend::stores_settings" title="Settings" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Backend::stores_settings"/>
27-
<add id="Magento_Backend::stores_attributes" title="Attributes" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
28-
<add id="Magento_Backend::other_settings" title="Other Settings" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
29-
<add id="Magento_Backend::system_other_settings" title="Other Settings" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
30-
<add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
10+
<add id="Magento_Backend::system_design_schedule" title="Schedule" translate="title" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
11+
<add id="Magento_Backend::system_currency" title="Currency" translate="title" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
12+
<add id="Magento_Backend::system_store" title="All Stores" translate="title" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
13+
<add id="Magento_Backend::dashboard" title="Dashboard" translate="title" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
14+
<add id="Magento_Backend::system" title="System" translate="title" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
15+
<add id="Magento_Backend::system_tools" title="Tools" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>
16+
<add id="Magento_Backend::system_design" title="Design" translate="title" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Backend::design"/>
17+
<add id="Magento_Backend::system_convert" title="Data Transfer" translate="title" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Backend::convert"/>
18+
<add id="Magento_Backend::system_cache" title="Cache Management" translate="title" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Backend::cache"/>
19+
<add id="Magento_Backend::marketing" title="Marketing" translate="title" module="Magento_Backend" sortOrder="40" resource="Magento_Backend::marketing"/>
20+
<add id="Magento_Backend::marketing_communications" title="Communications" translate="title" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_communications"/>
21+
<add id="Magento_Backend::marketing_seo" title="SEO &amp; Search" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_seo"/>
22+
<add id="Magento_Backend::marketing_user_content" title="User Content" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_user_content"/>
23+
<add id="Magento_Backend::content" title="Content" translate="title" module="Magento_Backend" sortOrder="50" resource="Magento_Backend::content"/>
24+
<add id="Magento_Backend::content_elements" title="Elements" translate="title" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Backend::content_elements"/>
25+
<add id="Magento_Backend::stores" title="Stores" translate="title" module="Magento_Backend" sortOrder="70" resource="Magento_Backend::stores"/>
26+
<add id="Magento_Backend::stores_settings" title="Settings" translate="title" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Backend::stores_settings"/>
27+
<add id="Magento_Backend::stores_attributes" title="Attributes" translate="title" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
28+
<add id="Magento_Backend::other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
29+
<add id="Magento_Backend::system_other_settings" title="Other Settings" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
30+
<add id="Magento_Backend::setup_wizard" action="adminhtml/backendapp/redirect/app/setup" title="Web Setup Wizard" translate="title" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system_tools" resource="Magento_Backend::setup_wizard"/>
3131
</menu>
3232
</config>

‎app/code/Magento/Backend/etc/menu.xsd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<xs:attribute name="resource" type="typeResource" use="required" />
3131
<xs:attribute name="dependsOnModule" type="typeModule" use="optional" />
3232
<xs:attribute name="dependsOnConfig" type="typeDependsConfig" use="optional" />
33+
<xs:attribute name="translate" type="xs:string" use="optional" />
3334
</xs:complexType>
3435
</xs:element>
3536
<xs:element name="update">
@@ -49,6 +50,7 @@
4950
<xs:attribute name="resource" type="typeResource" use="optional" />
5051
<xs:attribute name="dependsOnModule" type="typeModule" use="optional" />
5152
<xs:attribute name="dependsOnConfig" type="typeDependsConfig" use="optional" />
53+
<xs:attribute name="translate" type="xs:string" use="optional" />
5254
</xs:complexType>
5355
</xs:element>
5456
<xs:element name="remove">
@@ -64,7 +66,6 @@
6466
</xs:choice>
6567
</xs:sequence>
6668
</xs:complexType>
67-
6869
<xs:unique name="uniqueAddItemId">
6970
<xs:annotation>
7071
<xs:documentation>

0 commit comments

Comments
 (0)