Skip to content

Import message missing variable #3035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-team merged 2 commits into from Feb 23, 2016
Merged

Import message missing variable #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4cf23b
Import error message does not insert variable
Jan 1, 2016
2662cea
Merge branch 'develop' of https://github.com/magento/magento2 into de…
Jan 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogImportExport/Model/Import/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2145,7 +2145,7 @@ public function validateRow(array $rowData, $rowNum)

if (!$this->validator->isValid($rowData)) {
foreach ($this->validator->getMessages() as $message) {
$this->addRowError($message, $rowNum);
$this->addRowError($message, $rowNum, $this->validator->getInvalidAttribute());
}
}

Expand Down
32 changes: 31 additions & 1 deletion app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ class Validator extends AbstractValidator implements RowValidatorInterface
* @var array
*/
protected $_rowData;


/*
* @var string
*/
protected $_invalidAttribute;


/**
* @param \Magento\Framework\Stdlib\StringUtils $string
* @param RowValidatorInterface[] $validators
Expand Down Expand Up @@ -200,9 +206,32 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
}
$this->_uniqueAttributes[$attrCode][$rowData[$attrCode]] = $rowData[Product::COL_SKU];
}

if (!$valid) {
$this->setInvalidAttribute($attrCode);
}

return (bool)$valid;

}


public function setInvalidAttribute($attribute)
{
$this->_invalidAttribute = $attribute;
}

/*
* @return string
*/
public function getInvalidAttribute()
{
return $this->_invalidAttribute;
}





/**
* @return bool
Expand All @@ -211,6 +240,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
protected function isValidAttributes()
{
$this->_clearMessages();
$this->setInvalidAttribute(NULL);
if (!isset($this->_rowData['product_type'])) {
return false;
}
Expand Down