Skip to content

Commit 51c7033

Browse files
author
Oleksandr Gorkun
committed
Merge branch '2.2.6-develop' of https://github.com/magento/magento2ce into MAGETWO-92722
2 parents dbef5af + cc44334 commit 51c7033

File tree

134 files changed

+3079
-1748
lines changed

Some content is hidden

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

134 files changed

+3079
-1748
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
Your reports can be accessed securely on a personalized dashboard outside of the admin panel by clicking on the
1818
"Go to Advanced Reporting" link. </br> For more information, see our <a href="https://magento.com/legal/terms/cloud-terms">
1919
terms and conditions</a>.]]></comment>
20-
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
20+
<field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
2121
<label>Advanced Reporting Service</label>
2222
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
2323
<backend_model>Magento\Analytics\Model\Config\Backend\Enabled</backend_model>
2424
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel</frontend_model>
2525
<config_path>analytics/subscription/enabled</config_path>
2626
</field>
27-
<field id="collection_time" translate="label comment" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
27+
<field id="collection_time" translate="label" type="time" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
2828
<label>Time of day to send data</label>
2929
<frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel</frontend_model>
3030
<backend_model>Magento\Analytics\Model\Config\Backend\CollectionTime</backend_model>

‎app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,23 @@ public function getProductAttributeValue($product, $attribute)
214214
return (string)$value == '' ? __('No') : $value;
215215
}
216216

217+
/**
218+
* Check if any of the products has a value set for the attribute.
219+
*
220+
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
221+
* @return bool
222+
*/
223+
public function hasAttributeValueForProducts(\Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute) : bool
224+
{
225+
foreach ($this->getItems() as $item) {
226+
if ($item->hasData($attribute->getAttributeCode())) {
227+
return true;
228+
}
229+
}
230+
231+
return false;
232+
}
233+
217234
/**
218235
* Retrieve Print URL
219236
*

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -530,19 +530,6 @@ public function getStoreId()
530530
return $this->_storeManager->getStore()->getId();
531531
}
532532

533-
/**
534-
* Get collection instance
535-
*
536-
* @return object
537-
* @deprecated 101.1.0 because collections should be used directly via factory
538-
*/
539-
public function getResourceCollection()
540-
{
541-
$collection = parent::getResourceCollection();
542-
$collection->setStoreId($this->getStoreId());
543-
return $collection;
544-
}
545-
546533
/**
547534
* Get product url model
548535
*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
</group>
3737
<group id="recently_products" translate="label" type="text" sortOrder="350" showInDefault="1" showInWebsite="1" showInStore="0">
3838
<label>Recently Viewed/Compared Products</label>
39-
<field id="recently_viewed_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
39+
<field id="recently_viewed_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4040
<label>Lifetime of products in Recently Viewed Widget</label>
4141
</field>
42-
<field id="recently_compared_lifetime" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
42+
<field id="recently_compared_lifetime" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
4343
<label>Lifetime of products in Recently Compared Widget</label>
4444
</field>
4545
<field id="synchronize_with_backend" translate="label" type="select" showInDefault="1" canRestore="1">
@@ -83,7 +83,7 @@
8383
<backend_model>Magento\Catalog\Model\Indexer\Product\Flat\System\Config\Mode</backend_model>
8484
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
8585
</field>
86-
<field id="default_sort_by" translate="label comment" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
86+
<field id="default_sort_by" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
8787
<label>Product Listing Sort by</label>
8888
<source_model>Magento\Catalog\Model\Config\Source\ListSort</source_model>
8989
</field>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@
859859
<argument name="customFilters" xsi:type="array">
860860
<item name="category_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductCategoryFilter</item>
861861
<item name="store" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
862+
<item name="store_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductStoreFilter</item>
862863
<item name="website_id" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor\ProductWebsiteFilter</item>
863864
</argument>
864865
</arguments>

‎app/code/Magento/Catalog/view/adminhtml/requirejs-config.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,18 @@ var config = {
1616
},
1717
deps: [
1818
'Magento_Catalog/catalog/product'
19-
]
19+
],
20+
config: {
21+
mixins: {
22+
'Magento_Catalog/js/components/use-parent-settings/select': {
23+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
24+
},
25+
'Magento_Catalog/js/components/use-parent-settings/textarea': {
26+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
27+
},
28+
'Magento_Catalog/js/components/use-parent-settings/single-checkbox': {
29+
'Magento_Catalog/js/components/use-parent-settings/toggle-disabled-mixin': true
30+
}
31+
}
32+
}
2033
};

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -459,34 +459,34 @@
459459
</checkbox>
460460
</formElements>
461461
</field>
462-
<field name="custom_design" sortOrder="180" formElement="select">
462+
<field name="custom_design" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="180" formElement="select">
463463
<settings>
464464
<dataType>string</dataType>
465465
<label translate="true">Theme</label>
466466
<imports>
467-
<link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
467+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
468468
</imports>
469469
</settings>
470470
</field>
471-
<field name="page_layout" sortOrder="190" formElement="select">
471+
<field name="page_layout" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="190" formElement="select">
472472
<settings>
473473
<dataType>string</dataType>
474474
<label translate="true">Layout</label>
475475
<imports>
476-
<link name="disabled">${ $.parentName }.custom_use_parent_settings:checked</link>
476+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
477477
</imports>
478478
</settings>
479479
</field>
480-
<field name="custom_layout_update" sortOrder="200" formElement="textarea">
480+
<field name="custom_layout_update" component="Magento_Catalog/js/components/use-parent-settings/textarea" sortOrder="200" formElement="textarea">
481481
<settings>
482482
<dataType>string</dataType>
483483
<label translate="true">Layout Update XML</label>
484484
<imports>
485-
<link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings :checked</link>
485+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
486486
</imports>
487487
</settings>
488488
</field>
489-
<field name="custom_apply_to_products" component="Magento_Ui/js/form/element/single-checkbox" sortOrder="210" formElement="checkbox">
489+
<field name="custom_apply_to_products" component="Magento_Catalog/js/components/use-parent-settings/single-checkbox" sortOrder="210" formElement="checkbox">
490490
<argument name="data" xsi:type="array">
491491
<item name="config" xsi:type="array">
492492
<item name="default" xsi:type="number">0</item>
@@ -499,7 +499,7 @@
499499
<dataType>boolean</dataType>
500500
<label translate="true">Apply Design to Products</label>
501501
<imports>
502-
<link name="disabled">ns = ${ $.ns }, index = custom_use_parent_settings:checked</link>
502+
<link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked</link>
503503
</imports>
504504
</settings>
505505
<formElements>

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/select.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/select'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/single-checkbox.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/single-checkbox'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/use-parent-settings/textarea.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
/**
7+
* @api
8+
*/
9+
define([
10+
'Magento_Ui/js/form/element/textarea'
11+
], function (Component) {
12+
'use strict';
13+
14+
return Component;
15+
});

0 commit comments

Comments
 (0)