Merge pull request #215 from magento-engcom/modularity-inventory-catalog

Broken modularity in InventoryCatalog
magento · Nov 22, 2017 · 9489af1 · 9489af1
2 parents 36f759e + ef6f15f
commit 9489af1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml b/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml
@@ -6,12 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <!-- Stock delete button -->
-    <type name="Magento\InventoryCatalog\Ui\Component\Control\Stock\DeleteButton">
-        <arguments>
-            <argument name="deleteButton" xsi:type="object">Magento\Inventory\Ui\Component\Control\Stock\DeleteButton</argument>
-        </arguments>
-    </type>
     <!-- Product form configurations -->
     <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool">
         <arguments>

diff --git a/.../Component/Control/Stock/DeleteButton.php → .../Component/Control/Stock/DeleteButton.php b/.../Component/Control/Stock/DeleteButton.php → .../Component/Control/Stock/DeleteButton.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryCatalog\Ui\Component\Control\Stock;
+namespace Magento\InventorySales\Ui\Component\Control\Stock;
 
 use Magento\Backend\Ui\Component\Control\DeleteButton as StockDeleteButton;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;

diff --git a/app/code/Magento/InventorySales/etc/adminhtml/di.xml b/app/code/Magento/InventorySales/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <!-- Stock delete button -->
+    <type name="Magento\InventorySales\Ui\Component\Control\Stock\DeleteButton">
+        <arguments>
+            <argument name="deleteButton" xsi:type="object">Magento\Inventory\Ui\Component\Control\Stock\DeleteButton</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml b/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml
@@ -6,6 +6,11 @@
  */
 -->
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <settings>
+        <buttons>
+            <button name="delete" class="Magento\InventorySales\Ui\Component\Control\Stock\DeleteButton"/>
+        </buttons>
+    </settings>
     <fieldset name="sales_channels" sortOrder="30">
         <settings>
             <label translate="true">Sales Channels</label>