Merge pull request magento#870 from magento-engcom/868

MSI-868: Validation for URL key doesn't work and this leads to HTTP ERROR 500
fe-lix- · Apr 19, 2018 · 4882a24 · 4882a24
2 parents 745b8f8 + feca0cb
commit 4882a24
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/...LowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php b/...LowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php
@@ -65,11 +65,10 @@ public function __construct(
     public function modifyData(array $data)
     {
         $product = $this->locator->getProduct();
-        if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
-            return $data;
-        }
-
-        if (!isset($data[$product->getId()]['sources']['assigned_sources'])) {
+        if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false
+            || null === $product->getId()
+            || !isset($data[$product->getId()]['sources']['assigned_sources'])
+        ) {
             return $data;
         }