File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed
app/code/Magento/Ui/Model/Export Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -256,9 +256,11 @@ protected function getColumnOptions(): array
256
256
$ component = $ this ->filter ->getComponent ();
257
257
/** @var Column $columnComponent */
258
258
foreach ($ this ->getColumns ($ component ) as $ columnComponent ) {
259
- /** @var OptionSourceInterface $options */
260
- if ($ optionSource = $ columnComponent ->getData ('options ' )) {
261
- $ options [$ columnComponent ->getName ()] = $ this ->getOptionsArray ($ optionSource ->toOptionArray ());
259
+ if ($ columnComponent ->hasData ('options ' )) {
260
+ $ optionSource = $ columnComponent ->getData ('options ' );
261
+ $ optionsArray = $ optionSource instanceof OptionSourceInterface ?
262
+ $ optionSource ->toOptionArray () : $ optionSource ;
263
+ $ options [$ columnComponent ->getName ()] = $ this ->getOptionsArray ($ optionsArray );
262
264
}
263
265
}
264
266
You can’t perform that action at this time.
0 commit comments