Merge remote-tracking branch 'tango/MAGETWO-51831' into MAGETWO-51859

magento · Apr 13, 2016 · 1f2a854 · 1f2a854
2 parents 03eb24c + bd46881
commit 1f2a854
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -342,6 +342,7 @@ protected function customizeNameListeners(array $meta)
                     'handleShortDescriptionChanges' => '${$.provider}:data.product.short_description',
                     'handleSizeChanges' => '${$.provider}:data.product.size'
                 ],
+                'allowImport' => !$this->locator->getProduct()->getId(),
             ];
 
             if (!in_array($listener, $textListeners)) {
@@ -356,8 +357,7 @@ protected function customizeNameListeners(array $meta)
             $skuPath . static::META_CONFIG_PATH,
             $meta,
             [
-                'autoImportIfEmpty' => true,
-                'allowImport' => $this->locator->getProduct()->getId() ? false : true,
+                'autoImportIfEmpty' => true
             ]
         );