Merge remote-tracking branch 'upstream/develop' into develop

Author: Joan He

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

@@ -57,7 +57,7 @@ public function _validateMassStatus(array $productIds, $status)
      */
     public function execute()
     {
-        $productIds = (array) $this->getRequest()->getParam('product');
+        $productIds = (array) $this->getRequest()->getParam('selected');
         $storeId = (int) $this->getRequest()->getParam('store', 0);
         $status = (int) $this->getRequest()->getParam('status');
 

app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

@@ -210,12 +210,12 @@
                                 <item name="0" xsi:type="array">
                                     <item name="type" xsi:type="string">enable</item>
                                     <item name="label" xsi:type="string" translate="true">Enable</item>
-                                    <item name="url" xsi:type="string">catalog/product/massEnable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massStatus/status/1</item>
                                 </item>
                                 <item name="1" xsi:type="array">
                                     <item name="type" xsi:type="string">disable</item>
                                     <item name="label" xsi:type="string" translate="true">Disable</item>
-                                    <item name="url" xsi:type="string">catalog/product/massDisable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massStatus/status/2</item>
                                 </item>
                             </item>
                         </item>

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityFilterToCollection.php

@@ -19,16 +19,16 @@ class AddQuantityFilterToCollection implements AddFilterToCollectionInterface
      */
     public function addFilter(Collection $collection, $field, $condition = null)
     {
-        if (isset($condition['from'])) {
+        if (isset($condition['gteq'])) {
             $collection->getSelect()->where(
                 AbstractCollection::ATTRIBUTE_TABLE_ALIAS_PREFIX . 'qty.qty >= ?',
-                (float)$condition['from']
+                (float)$condition['gteq']
             );
         }
-        if ($condition['to']) {
+        if (isset($condition['lteq'])) {
             $collection->getSelect()->where(
                 AbstractCollection::ATTRIBUTE_TABLE_ALIAS_PREFIX . 'qty.qty <= ?',
-                (float)$condition['to']
+                (float)$condition['lteq']
             );
         }
     }

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -1262,6 +1262,7 @@ protected function _collectSaveData($newObject)
 
             if (!$attribute->isInSet($newObject->getAttributeSetId()) && !in_array($k, $staticFields)) {
                 $this->_aggregateDeleteData($delete, $attribute, $newObject);
+                continue;
             }
 
             $attrId = $attribute->getAttributeId();

app/code/Magento/Eav/Test/Unit/Model/Entity/AbstractEntityTest.php

@@ -239,7 +239,6 @@ public function testSave($attributeCode, $attributeSetId, $productData, $product
                 'getAffectedFields',
                 'isStatic',
                 'getEntityValueId',
-                'getEntityIdField'
             ]
         );
 
@@ -255,14 +254,6 @@ public function testSave($attributeCode, $attributeSetId, $productData, $product
 
         $backendModel->expects($this->never())->method('getEntityValueId');
 
-        $backendModel->expects(
-            isset($productData['entity_id']) ? $this->never() : $this->once()
-        )->method(
-            'getEntityIdField'
-        )->will(
-            $this->returnValue('entity_id')
-        );
-
         $backendModel->setAttribute($attribute);
         $attribute->expects($this->any())->method('getBackend')->will($this->returnValue($backendModel));
         $attribute->setId(222);

app/code/Magento/Eav/Test/Unit/Model/Entity/VersionControl/AbstractEntityTest.php

@@ -88,7 +88,6 @@ public function testSave($attributeCode, $attributeSetId, $productData, $product
                 'getAffectedFields',
                 'isStatic',
                 'getEntityValueId',
-                'getEntityIdField'
             ]
         );
 
@@ -102,14 +101,6 @@ public function testSave($attributeCode, $attributeSetId, $productData, $product
 
         $backendModel->expects($this->any())->method('isStatic')->will($this->returnValue(false));
         $backendModel->expects($this->never())->method('getEntityValueId');
-        $backendModel->expects(
-            isset($productData['entity_id']) ? $this->never() : $this->once()
-        )->method(
-            'getEntityIdField'
-        )->will(
-            $this->returnValue('entity_id')
-        );
-
         $backendModel->setAttribute($attribute);
 
         $attribute->expects($this->any())->method('getBackend')->will($this->returnValue($backendModel));