Skip to content

Customer Attributes Options with option group fixed #30421

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
merged 6 commits into from
Nov 27, 2020
Merged

Customer Attributes Options with option group fixed #30421

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5a64c7
Customer Attributes Options with option group fixed
nitishcs6 Oct 10, 2020
57a4510
Merge branch '2.4-develop' into customer-select-option-fix
engcom-Charlie Nov 2, 2020
9dc798f
add integration test
engcom-Charlie Nov 2, 2020
55f6ce9
fix static
engcom-Charlie Nov 2, 2020
d22f7f1
Merge branch '2.4-develop' into customer-select-option-fix
engcom-Charlie Nov 9, 2020
6eff507
add a check on is array
engcom-Charlie Nov 9, 2020
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
6 changes: 5 additions & 1 deletion app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,13 @@ protected function getOptionArray(array $options)
{
/** @var \Magento\Customer\Api\Data\OptionInterface $option */
foreach ($options as &$option) {
$value = $option->getValue();
if ($option->getOptions()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Since the OptionsInterface does not have strict return types on its functions, the getOptions may not return an array, which may lead to a problem since the getOptionArray does require an array.

Suggested change
if ($option->getOptions()) {
if (is_array($option->getOptions())) {

What do you think?

$value = $this->getOptionArray($option->getOptions());
}
$option = [
'label' => (string)$option->getLabel(),
'value' => $option->getValue(),
'value' => $value,
'__disableTmpl' => true
];
}
Expand Down