MAGETWO-54200: Wrong "gift_message_available" parameter exported

Author: duhon

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -84,7 +84,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @var string[]
      */
     protected $_indexValueAttributes = [
-        'status'
+        'status',
     ];
 
     /**

app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php

@@ -181,11 +181,13 @@ protected function getItemLevelGiftMessages()
             $itemLevelConfig[$itemId] = [];
             $isMessageAvailable = $item->getProduct()->getGiftMessageAvailable();
 
-            if ($isMessageAvailable == Boolean::VALUE_USE_CONFIG || in_array($isMessageAvailable, [null, ''], true)) {
+            if ($isMessageAvailable == Boolean::VALUE_USE_CONFIG) {
                 $itemLevelConfig[$itemId]['is_available'] = (bool)$this->scopeConfiguration->getValue(
                     GiftMessageHelper::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
                     ScopeInterface::SCOPE_STORE
                 );
+            } else {
+                $itemLevelConfig[$itemId]['is_available'] = (bool)$isMessageAvailable;
             }
             $message = $this->itemRepository->get($quote->getId(), $itemId);
             if ($message) {

app/code/Magento/GiftMessage/Setup/InstallData.php

@@ -94,7 +94,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'label' => 'Allow Gift Message',
                 'input' => 'select',
                 'class' => '',
-                'source' => 'Magento\Eav\Model\Entity\Attribute\Source\Boolean',
+                'source' => 'Magento\Catalog\Model\Product\Attribute\Source\Boolean',
                 'global' => true,
                 'visible' => true,
                 'required' => false,

app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php

@@ -58,13 +58,13 @@ public function __construct(
     public function modifyData(array $data)
     {
         $modelId = $this->locator->getProduct()->getId();
-        $value = '';
+        $value = Boolean::VALUE_USE_CONFIG;
 
         if (isset($data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE])) {
             $value = $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE];
         }
 
-        if ($value == Boolean::VALUE_USE_CONFIG || $value === '' || $value === null) {
+        if ($value == Boolean::VALUE_USE_CONFIG) {
             $data[$modelId][static::DATA_SOURCE_DEFAULT][static::FIELD_MESSAGE_AVAILABLE] = $this->getValueFromConfig();
             $data[$modelId][static::DATA_SOURCE_DEFAULT]['use_config_' . static::FIELD_MESSAGE_AVAILABLE] = '1';
         }