Skip to content

Commit 00e7958

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACQE-5379
2 parents fcdc7f7 + bc1c7ba commit 00e7958

File tree

205 files changed

+290
-551
lines changed

Some content is hidden

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

205 files changed

+290
-551
lines changed

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Categories tree with checkboxes
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Category form image field helper
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
1311

@@ -39,6 +37,8 @@ public function __construct(
3937
}
4038

4139
/**
40+
* Return the URL
41+
*
4242
* @return bool|string
4343
*/
4444
protected function _getUrl()

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml additional helper block for sort by
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
1311

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Product in category grid
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
1311

@@ -127,6 +125,7 @@ protected function _prepareCollection()
127125
if ($this->getCategory()->getId()) {
128126
$this->setDefaultFilter(['in_category' => 1]);
129127
}
128+
130129
$collection = $this->_productFactory->create()->getCollection()->addAttributeToSelect(
131130
'name'
132131
)->addAttributeToSelect(
@@ -150,13 +149,15 @@ protected function _prepareCollection()
150149
if ($storeId > 0) {
151150
$collection->addStoreFilter($storeId);
152151
}
152+
153153
$this->setCollection($collection);
154154

155155
if ($this->getCategory()->getProductsReadonly()) {
156156
$productIds = $this->_getSelectedProducts();
157157
if (empty($productIds)) {
158158
$productIds = 0;
159159
}
160+
160161
$this->getCollection()->addFieldToFilter('entity_id', ['in' => $productIds]);
161162
}
162163

@@ -183,6 +184,7 @@ protected function _prepareColumns()
183184
]
184185
);
185186
}
187+
186188
$this->addColumn(
187189
'entity_id',
188190
[
@@ -264,6 +266,7 @@ protected function _getSelectedProducts()
264266
$products = $this->getCategory()->getProductsPosition();
265267
return array_keys($products);
266268
}
269+
267270
return $products;
268271
}
269272
}

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Category chooser for Wysiwyg CMS widget
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Catalog\Block\Adminhtml\Category\Widget;
1311

@@ -27,6 +25,8 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
2725
protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
2826

2927
/**
28+
* Initialise the block
29+
*
3030
* @return void
3131
*/
3232
protected function _construct()

‎app/code/Magento/Catalog/Block/Adminhtml/Form.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Base block for rendering category and product forms
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml;
138

149
use Magento\Backend\Block\Widget\Form\Generic;
1510

11+
/**
12+
* Base block for rendering category and product forms
13+
*/
1614
class Form extends Generic
1715
{
1816
/**
17+
* Prepare the layout
18+
*
1919
* @return void
2020
*/
2121
protected function _prepareLayout()

‎app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Catalog Custom Options Config Renderer
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
138

149
use Magento\Config\Block\System\Config\Form\Field;
1510
use Magento\Framework\Data\Form\Element\AbstractElement;
1611

12+
/**
13+
* Catalog Custom Options Config Renderer
14+
*/
1715
class DateFieldsOrder extends Field
1816
{
1917
/**
18+
* Return the HTML for this element
19+
*
2020
* @param AbstractElement $element
2121
* @return string
2222
* @SuppressWarnings(PHPMD.NPathComplexity)

‎app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Catalog Custom Options Config Renderer
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
11-
*/
127
namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
138

149
use Magento\Config\Block\System\Config\Form\Field;
1510
use Magento\Framework\Data\Form\Element\AbstractElement;
1611

12+
/**
13+
* Catalog Custom Options Config Renderer
14+
*/
1715
class YearRange extends Field
1816
{
1917
/**
18+
* Return the HTML for this element
19+
*
2020
* @param AbstractElement $element
2121
* @return string
2222
*/

0 commit comments

Comments
 (0)