Merge remote-tracking branch 'origin/MAGETWO-54200' into pr_branch

Author: mslabko

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

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

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

@@ -196,7 +196,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     protected $_indexValueAttributes = [
         'status',
         'tax_class_id',
-        'gift_message_available',
     ];
 
     /**

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/Setup/UpgradeData.php

@@ -35,19 +35,20 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
     {
         $setup->startSetup();
 
+        /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+        $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
+        $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
+        $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
+
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
-            $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+
             $groupName = 'Gift Options';
 
             if (!$categorySetup->getAttributeGroup(Product::ENTITY, 'Default', $groupName)) {
                 $categorySetup->addAttributeGroup(Product::ENTITY, 'Default', $groupName, 60);
             }
 
-            $entityTypeId = $categorySetup->getEntityTypeId(Product::ENTITY);
-            $attributeSetId = $categorySetup->getAttributeSetId($entityTypeId, 'Default');
-            $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
-
             $categorySetup->addAttributeToGroup(
                 $entityTypeId,
                 $attributeSetId,
@@ -57,6 +58,16 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             );
         }
 
+        if (version_compare($context->getVersion(), '2.1.0', '<')) {
+
+            $categorySetup->updateAttribute(
+                $entityTypeId,
+                $attribute['attribute_id'],
+                'source_model',
+                'Magento\Catalog\Model\Product\Attribute\Source\Boolean'
+            );
+        }
+
         $setup->endSetup();
     }
 }