';
+ }
+
+ $resultBlock->addNotice(
+ $noticeHtml
+ );
+
$this->addErrorMessages($resultBlock, $errorAggregator);
$resultBlock->addSuccess(__('Import successfully done'));
}
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index e965e8ad207fd..1fc3257ff2c1e 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -554,7 +554,9 @@ public function getBehavior()
$this->_parameters['behavior']
) ||
$this->_parameters['behavior'] != ImportExport::BEHAVIOR_APPEND &&
+ $this->_parameters['behavior'] != ImportExport::BEHAVIOR_ADD_UPDATE &&
$this->_parameters['behavior'] != ImportExport::BEHAVIOR_REPLACE &&
+ $this->_parameters['behavior'] != ImportExport::BEHAVIOR_CUSTOM &&
$this->_parameters['behavior'] != ImportExport::BEHAVIOR_DELETE
) {
return ImportExport::getDefaultBehavior();
@@ -828,6 +830,8 @@ public function validateData()
}
/**
+ * Get error aggregator object
+ *
* @return ProcessingErrorAggregatorInterface
*/
public function getErrorAggregator()
diff --git a/app/code/Magento/Integration/Plugin/Model/AdminUser.php b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
index df3766250caa7..7b2fa1981bce3 100644
--- a/app/code/Magento/Integration/Plugin/Model/AdminUser.php
+++ b/app/code/Magento/Integration/Plugin/Model/AdminUser.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Integration\Plugin\Model;
use Magento\Integration\Model\AdminTokenService;
@@ -31,14 +32,15 @@ public function __construct(
*
* @param \Magento\User\Model\User $subject
* @param \Magento\Framework\DataObject $object
- * @return $this
+ * @return \Magento\User\Model\User
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function afterSave(
\Magento\User\Model\User $subject,
\Magento\Framework\DataObject $object
- ) {
+ ): \Magento\User\Model\User {
$isActive = $object->getIsActive();
- if (isset($isActive) && $isActive == 0) {
+ if ($isActive !== null && $isActive == 0) {
$this->adminTokenService->revokeAdminAccessToken($object->getId());
}
return $subject;
diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
index 79fbf0b3db17b..f1824fadb97fd 100644
--- a/app/code/Magento/Integration/etc/db_schema.xml
+++ b/app/code/Magento/Integration/etc/db_schema.xml
@@ -136,7 +136,7 @@
comment="User type (admin or customer)"/>