MAGETWO-80828: A solution for Product Repeat Issue after filter on category listing page. #11206

Author: vrann

app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

@@ -192,7 +192,14 @@ public function setCollection($collection)
             $this->_collection->setPageSize($limit);
         }
         if ($this->getCurrentOrder()) {
-            $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());
+            if (($this->getCurrentOrder()) == 'position') {
+                $this->_collection->addAttributeToSort(
+                    $this->getCurrentOrder(),
+                    $this->getCurrentDirection()
+                )->addAttributeToSort('entity_id', $this->getCurrentDirection());
+            } else {
+                $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());
+            }
         }
         return $this;
     }

app/code/Magento/Wishlist/Model/Config.php

@@ -22,19 +22,19 @@ class Config
     /**
      * @var \Magento\Catalog\Model\Config
      */
-    private $_catalogConfig;
+    private $catalogConfig;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\Config
      */
-    private $_attributeConfig;
+    private $attributeConfig;
 
     /**
      * Number of emails allowed for sharing wishlist
      *
      * @var int
      */
-    private $_sharingEmailLimit;
+    private $sharingEmailLimit;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -54,10 +54,10 @@ public function __construct(
             self::XML_PATH_SHARING_TEXT_LIMIT,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        $this->_sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT;
+        $this->sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT;
         $this->_sharignTextLimit = $textLimitInConfig ?: self::SHARING_TEXT_LIMIT;
-        $this->_catalogConfig = $catalogConfig;
-        $this->_attributeConfig = $attributeConfig;
+        $this->catalogConfig = $catalogConfig;
+        $this->attributeConfig = $attributeConfig;
     }
 
     /**
@@ -67,8 +67,8 @@ public function __construct(
      */
     public function getProductAttributes()
     {
-        $catalogAttributes = $this->_catalogConfig->getProductAttributes();
-        $wishlistAttributes = $this->_attributeConfig->getAttributeNames('wishlist_item');
+        $catalogAttributes = $this->catalogConfig->getProductAttributes();
+        $wishlistAttributes = $this->attributeConfig->getAttributeNames('wishlist_item');
         return array_merge($catalogAttributes, $wishlistAttributes);
     }
 
@@ -79,7 +79,7 @@ public function getProductAttributes()
      */
     public function getSharingEmailLimit()
     {
-        return $this->_sharingEmailLimit;
+        return $this->sharingEmailLimit;
     }
 
     /**

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerBackendEntity.xml

@@ -9,6 +9,7 @@
     <testCase name="Magento\Customer\Test\TestCase\CreateExistingCustomerBackendEntity" summary="Create Existing Customer from Backend" ticketId="MAGETWO-43685">
         <variation name="CreateExistingCustomerBackendEntity1" summary="Create existing customer on Backend.">
             <data name="customer/dataset" xsi:type="string">default</data>
+            <data name="issue" xsi:type="string">MAGETWO-81744: [Jenkins] Random fail of Requisition List Test and CreateExistingCustomerBackendEntity</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerBackendDuplicateErrorMessage" />
         </variation>
     </testCase>