Skip to content

Commit 4ce30a0

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/2.3-develop' into EPAM-PR-81
2 parents c88abfe + 55519da commit 4ce30a0

File tree

94 files changed

+1136
-1047
lines changed

Some content is hidden

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

94 files changed

+1136
-1047
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Please see LICENSE_EE.txt for the full text of the MEE License or visit https://
6464

6565
## Community Engineering Slack
6666

67-
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [[email protected]](mailto:[email protected]) or [self signup](https://tinyurl.com/engcom-slack).
67+
To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us a request at [[email protected]](mailto:[email protected]) or [self signup](https://opensource.magento.com/slack).
6868

6969

7070
We have channels for each project. These channels are recommended for new members:

‎app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
* See COPYING.txt for license details.
44
*/
55

6-
(function (factory) {
7-
if (typeof define === 'function' && define.amd) {
8-
define([
9-
'jquery',
10-
'mage/backend/validation',
11-
'prototype'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function (jQuery) {
17-
6+
define([
7+
'jquery',
8+
'mage/backend/validation',
9+
'prototype'
10+
], function (jQuery) {
1811
window.directPost = Class.create();
1912
directPost.prototype = {
2013
initialize: function (methodCode, iframeId, controller, orderSaveUrl, cgiUrl, nativeAction) {
@@ -349,4 +342,4 @@
349342
}
350343
}
351344
};
352-
}));
345+
});

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,22 +482,22 @@
482482
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
483483
<label>Base URL</label>
484484
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
485-
<comment>Specify URL or {{base_url}} placeholder.</comment>
485+
<comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
486486
</field>
487487
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
488488
<label>Base Link URL</label>
489489
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
490-
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
490+
<comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
491491
</field>
492492
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
493493
<label>Base URL for Static View Files</label>
494494
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
495-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
495+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
496496
</field>
497497
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
498498
<label>Base URL for User Media Files</label>
499499
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
500-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
500+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
501501
</field>
502502
</group>
503503
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
506506
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
507507
<label>Secure Base URL</label>
508508
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
509-
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
509+
<comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
510510
</field>
511511
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
512512
<label>Secure Base Link URL</label>
513513
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
514-
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
514+
<comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
515515
</field>
516516
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
517517
<label>Secure Base URL for Static View Files</label>
518518
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
519-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
519+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
520520
</field>
521521
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
522522
<label>Secure Base URL for User Media Files</label>
523523
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
524-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
524+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
525525
</field>
526526
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
527527
<label>Use Secure URLs on Storefront</label>

‎app/code/Magento/Backend/view/adminhtml/web/js/translate.js‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
*/
55

66
/* eslint-disable strict */
7-
(function (factory) {
8-
if (typeof define === 'function' && define.amd) {
9-
define([
10-
'jquery',
11-
'mage/mage'
12-
], factory);
13-
} else {
14-
factory(jQuery);
15-
}
16-
}(function ($) {
7+
define([
8+
'jquery',
9+
'mage/mage'
10+
], function ($) {
1711
$.extend(true, $, {
1812
mage: {
1913
translate: (function () {
@@ -51,4 +45,4 @@
5145
$.mage.__ = $.proxy($.mage.translate.translate, $.mage.translate);
5246

5347
return $.mage.__;
54-
}));
48+
});

‎app/code/Magento/Bundle/Setup/Patch/Schema/ChangeTmpTablesEngine.php‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎app/code/Magento/Bundle/etc/db_schema.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<column name="website_id"/>
204204
</constraint>
205205
</table>
206-
<table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
206+
<table name="catalog_product_index_price_bundle_tmp" resource="default" engine="innodb"
207207
comment="Catalog Product Index Price Bundle Tmp">
208208
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
209209
comment="Entity ID"/>
@@ -265,7 +265,7 @@
265265
<column name="selection_id"/>
266266
</constraint>
267267
</table>
268-
<table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
268+
<table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="innodb"
269269
comment="Catalog Product Index Price Bundle Sel Tmp">
270270
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
271271
comment="Entity ID"/>
@@ -320,7 +320,7 @@
320320
<column name="option_id"/>
321321
</constraint>
322322
</table>
323-
<table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
323+
<table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="innodb"
324324
comment="Catalog Product Index Price Bundle Opt Tmp">
325325
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
326326
comment="Entity ID"/>

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
78
namespace Magento\Catalog\Controller\Adminhtml\Product;
89

910
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
1011

12+
/**
13+
* Edit product
14+
*/
1115
class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
1216
{
1317
/**
@@ -51,7 +55,7 @@ public function execute()
5155
$productId = (int) $this->getRequest()->getParam('id');
5256
$product = $this->productBuilder->build($this->getRequest());
5357

54-
if (($productId && !$product->getEntityId())) {
58+
if ($productId && !$product->getEntityId()) {
5559
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
5660
$resultRedirect = $this->resultRedirectFactory->create();
5761
$this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,6 +1595,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
15951595
} else {
15961596
return parent::addAttributeToFilter($attribute, $condition, $joinType);
15971597
}
1598+
1599+
return $this;
15981600
}
15991601

16001602
/**

‎app/code/Magento/Catalog/Setup/Patch/Schema/ChangeTmpTablesEngine.php‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
726726

727727
// TODO: getAttributeModel() should not be used when MAGETWO-48284 is complete
728728
$childData = $this->arrayManager->get($configPath, $meta, []);
729-
if (($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData))) {
729+
if ($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData)) {
730730
$meta = $this->arrayManager->merge($configPath, $meta, ['validation' => $rules]);
731731
}
732732

0 commit comments

Comments
 (0)