Merge remote-tracking branch 'rog/issue-36208' into AC-6761

Author: glo80326

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

@@ -18,10 +18,13 @@
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class Product in category grid
+ */
 class Product extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
-     * Core registry
+     * Core registry model
      *
      * @var \Magento\Framework\Registry
      */
@@ -68,6 +71,8 @@ public function __construct(
     }
 
     /**
+     * Initialize object
+     *
      * @return void
      */
     protected function _construct()
@@ -79,6 +84,8 @@ protected function _construct()
     }
 
     /**
+     * Get current category
+     *
      * @return array|null
      */
     public function getCategory()
@@ -87,6 +94,8 @@ public function getCategory()
     }
 
     /**
+     * Add column filter to collection
+     *
      * @param Column $column
      * @return $this
      */
@@ -110,6 +119,8 @@ protected function _addColumnFilterToCollection($column)
     }
 
     /**
+     * Prepare collection.
+     *
      * @return Grid
      */
     protected function _prepareCollection()
@@ -136,6 +147,7 @@ protected function _prepareCollection()
             'left'
         );
         $storeId = (int)$this->getRequest()->getParam('store', 0);
+        $collection->setStoreId($storeId);
         if ($storeId > 0) {
             $collection->addStoreFilter($storeId);
         }
@@ -153,6 +165,8 @@ protected function _prepareCollection()
     }
 
     /**
+     * Prepare columns.
+     *
      * @return Extended
      */
     protected function _prepareColumns()
@@ -230,6 +244,8 @@ protected function _prepareColumns()
     }
 
     /**
+     * Retrieve grid reload url
+     *
      * @return string
      */
     public function getGridUrl()
@@ -238,6 +254,8 @@ public function getGridUrl()
     }
 
     /**
+     * Get selected products
+     *
      * @return array
      */
     protected function _getSelectedProducts()