Skip to content
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

Jump to bottom

Fix check for boolean product attributes #8623

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Fix check for boolean product attributes #8623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/code/Magento/Catalog/Block/Product/View/Attributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Magento\Catalog\Block\Product\View;

use Magento\Catalog\Model\Product;
use Magento\Framework\Phrase;
use Magento\Framework\Pricing\PriceCurrencyInterface;

class Attributes extends \Magento\Framework\View\Element\Template
Expand Down Expand Up @@ -85,8 +86,8 @@ public function getAdditionalData(array $excludeAttr = [])
} elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
$value = $this->priceCurrency->convertAndFormat($value);
}

if (is_string($value) && strlen($value)) {
if ($value instanceof Phrase || (is_string($value) && strlen($value))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, from second look I have a little suggestion :) As Phrase accepts empty text, we need to check its length too.

So, it would be nice to add something like

$value = $value instanceof Phrase ? (string)$value : $value;

prior to if instead of additional condition.

Would be nice to add a unit test for this case, but it's up to you, I believe.

And please link commit to your GitHub account: https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/ ;)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see a big difference between current solution and the one you proposed.
It's not mandatory to convert Phrase into string to pass data into template

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maghamed, right part of (is_string($value) && strlen($value)) is not checked in case of Phrase currently.

I didn't think deeper if this is a problem or not (like, maybe there is no need to check length at all).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ishakhsuvarov @maghamed so check for strlen could be simply removed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This failure to check for empty string results in empty attributes displaying as N/A in product view versus suppressing lines that have no value. Please fix to 2.1-develop !

$data[$attribute->getAttributeCode()] = [
'label' => __($attribute->getStoreLabel()),
'value' => $value,
Expand Down