Merge remote-tracking branch 'origin/develop' into UI

Natalia Momotenko · Natalia Momotenko · commit 893ef07f0205 · 2015-05-15T19:37:34.000+03:00
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
@@ -279,7 +279,7 @@ public function getOperationResultMessages($validationResult)
      */
     public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
-        if ($attribute->usesSource()) {
+        if ($attribute->usesSource() && in_array($attribute->getFrontendInput(), array('select', 'multiselect'))) {
             return $attribute->getFrontendInput() == 'multiselect' ? 'multiselect' : 'select';
         } elseif ($attribute->isStatic()) {
             return $attribute->getFrontendInput() == 'date' ? 'datetime' : 'varchar';

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public function getOperationResultMessages($validationResult)`
`279`	`279`	`*/`
`280`	`280`	`public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)`
`281`	`281`	`{`
`282`		`- if ($attribute->usesSource()) {`
	`282`	`+ if ($attribute->usesSource() && in_array($attribute->getFrontendInput(), array('select', 'multiselect'))) {`
`283`	`283`	`return $attribute->getFrontendInput() == 'multiselect' ? 'multiselect' : 'select';`
`284`	`284`	`} elseif ($attribute->isStatic()) {`
`285`	`285`	`return $attribute->getFrontendInput() == 'date' ? 'datetime' : 'varchar';`