Merge pull request magento#5262 from magento-obsessive-owls/PR-2.4

[Owls] Bugfix
mage2pratik · Feb 5, 2020 · 7322e87 · 7322e87
2 parents 606c3e8 + aa7a519
commit 7322e87
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Stock.php b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
@@ -42,7 +42,7 @@ public function getAllOptions()
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
     {
         $collection->getSelect()->joinLeft(
-            ['stock_item_table' => 'cataloginventory_stock_item'],
+            ['stock_item_table' => $collection->getTable('cataloginventory_stock_item')],
             "e.entity_id=stock_item_table.product_id",
             []
         );

diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php
@@ -25,6 +25,7 @@ public function testAddValueSortToCollection()
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $collectionMock = $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
         $collectionMock->expects($this->atLeastOnce())->method('getSelect')->willReturn($selectMock);
+        $collectionMock->expects($this->atLeastOnce())->method('getTable')->willReturn('cataloginventory_stock_item');
 
         $selectMock->expects($this->once())
             ->method('joinLeft')

diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -192,7 +192,7 @@ define([
          * @param {String} title
          */
         setTitle: function (title) {
-            var $title = $(this.options.modalTitle),
+            var $title = this.modal.find(this.options.modalTitle),
                 $subTitle = this.modal.find(this.options.modalSubTitle);
 
             $title.text(title);