Skip to content

Commit

Permalink
Merge commit 'refs/pull/1087/head' of https://github.com/magento/mage…
Browse files Browse the repository at this point in the history
…nto2 into MAGETWO-35406
Yaroslav Onischenko committed May 14, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 271aec2 + 5e64d08 commit b7f6947
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/code/Magento/ImportExport/Model/Import.php
Original file line number Diff line number Diff line change
@@ -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';

0 comments on commit b7f6947

Please sign in to comment.