From 335cc77a0c9c232d4c17ee9e212845bd66962693 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 6 Feb 2019 13:17:22 +0200
Subject: [PATCH 1/2] MAGETWO-98105: Import button is available in cases it's
 shouldn't.

---
 .../ImportExport/Controller/Adminhtml/Import/Validate.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index a0992e28bb2cd..fa84abca5ce23 100644
--- 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()->hasFatalExceptions()) {
+        if (!$import->getErrorAggregator()->hasToBeTerminated()) {
             $resultBlock->addSuccess(
                 __('Please fix errors and re-upload file or simply press "Import" button to skip rows with errors'),
                 true

From 93b1e0d7f4a6e6da1300649da2afc90f61e14632 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Fri, 8 Feb 2019 17:00:49 +0200
Subject: [PATCH 2/2] MAGETWO-98105: Import button is available in cases it's
 shouldn't.

---
 app/code/Magento/CatalogImportExport/Model/Import/Product.php   | 2 +-
 .../ImportExport/Controller/Adminhtml/Import/Validate.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index c525b69b91e7f..de402279d75f7 100644
--- 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
index fa84abca5ce23..a0992e28bb2cd 100644
--- 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