Merge pull request #335 from magento-goinc/pr-335

[SWAT] Bug fixes

Author: Slabko,Michael(mslabko)

app/code/Magento/CatalogInventory/Helper/Stock.php

@@ -69,12 +69,12 @@ public function __construct(
      * Assign stock status information to product
      *
      * @param Product $product
-     * @param int $stockStatus
+     * @param int $status
      * @return void
      */
-    public function assignStatusToProduct(Product $product, $stockStatus = null)
+    public function assignStatusToProduct(Product $product, $status = null)
     {
-        if ($stockStatus === null) {
+        if ($status === null) {
             $websiteId = $product->getStore()->getWebsiteId();
             $stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $websiteId);
             $status = $stockStatus->getStockStatus();

app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php

@@ -34,10 +34,7 @@ public function execute(EventObserver $observer)
     {
         $product = $observer->getEvent()->getProduct();
         if ($product instanceof \Magento\Catalog\Model\Product) {
-            $this->stockHelper->assignStatusToProduct(
-                $product,
-                $product->getStockStatus()
-            );
+            $this->stockHelper->assignStatusToProduct($product);
         }
     }
 }

app/code/Magento/CatalogInventory/Test/Unit/Observer/AddInventoryDataObserverTest.php

@@ -57,24 +57,17 @@ protected function setUp()
 
     public function testAddInventoryData()
     {
-        $stockStatus = true;
-
         $product = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->disableOriginalConstructor()
-            ->setMethods(['getStockStatus'])
             ->getMock();
 
-        $product->expects($this->once())
-            ->method('getStockStatus')
-            ->will($this->returnValue($stockStatus));
-
         $this->event->expects($this->once())
             ->method('getProduct')
             ->will($this->returnValue($product));
 
         $this->stockHelper->expects($this->once())
             ->method('assignStatusToProduct')
-            ->with($product, $stockStatus)
+            ->with($product)
             ->will($this->returnSelf());
 
         $this->observer->execute($this->eventObserver);

app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js

@@ -65,7 +65,10 @@ define([
             if (productType.type.current === 'downloadable') {
                 weight.change(false);
                 weight.$weightSwitcher().one('change', function () {
-                    $(document).trigger('setTypeProduct', null);
+                    $(document).trigger(
+                        'setTypeProduct',
+                        productType.type.init === 'downloadable' ? 'virtual' : productType.type.init
+                    );
                 });
                 this.show();
             } else {

app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml

@@ -13,14 +13,14 @@
     <div class="content" style="clear: both;">
         <input type="hidden" name="categories" id="product_categories" value="" />
         <?php if ($block->getRoot()): ?>
-        <div data-mage-init='<?php
+        <div data-mage-init="<?php
             echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
                 'categoryTree' => [
                     'data' => $block->getTreeArray(null),
                     'url' => $block->getLoadTreeUrl(),
                 ],
             ]));
-        ?>' class="jstree-default"></div>
+        ?>" class="jstree-default"></div>
         <?php endif; ?>
     </div>
 </fieldset>