MAGETWO-98105: Import button is available in cases it's shouldn't.

Sergey Shvets · Sergey Shvets · commit 93b1e0d7f4a6 · 2019-02-08T17:00:49.000+02:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2556,7 +2556,7 @@ public function validateRow(array $rowData, $rowNum)
                         $rowNum,
                         $rowData[self::COL_NAME],
                         $message,
-                        ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                        $errorLevel
                     )
                         ->getErrorAggregator()
                         ->addRowToSkip($rowNum);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -136,7 +136,7 @@ private function getImport()
     private function addMessageToSkipErrors(Result $resultBlock)
     {
         $import = $this->getImport();
-        if (!$import->getErrorAggregator()->hasToBeTerminated()) {
+        if (!$import->getErrorAggregator()->hasFatalExceptions()) {
             $resultBlock->addSuccess(
                 __('Please fix errors and re-upload file or simply press "Import" button to skip rows with errors'),
                 true

Original file line number	Diff line number	Diff line change
`@@ -2556,7 +2556,7 @@ public function validateRow(array $rowData, $rowNum)`
`2556`	`2556`	`$rowNum,`
`2557`	`2557`	`$rowData[self::COL_NAME],`
`2558`	`2558`	`$message,`
`2559`		`- ProcessingError::ERROR_LEVEL_NOT_CRITICAL`
	`2559`	`+ $errorLevel`
`2560`	`2560`	`)`
`2561`	`2561`	`->getErrorAggregator()`
`2562`	`2562`	`->addRowToSkip($rowNum);`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private function getImport()`
`136`	`136`	`private function addMessageToSkipErrors(Result $resultBlock)`
`137`	`137`	`{`
`138`	`138`	`$import = $this->getImport();`
`139`		`- if (!$import->getErrorAggregator()->hasToBeTerminated()) {`
	`139`	`+ if (!$import->getErrorAggregator()->hasFatalExceptions()) {`
`140`	`140`	`$resultBlock->addSuccess(`
`141`	`141`	`__('Please fix errors and re-upload file or simply press "Import" button to skip rows with errors'),`
`142`	`142`	`true`