Skip to content
Snippets Groups Projects
Commit f6119638 authored by Oleksandr Karpenko's avatar Oleksandr Karpenko
Browse files

Merge branch 'MAGETWO-42988' of...

Merge branch 'MAGETWO-42988' of https://github.corp.magento.com/magento-south/magento2ce into MAGETWO-42988
parents 9891ed3a a698766e
Branches
No related merge requests found
......@@ -22,7 +22,7 @@ use Magento\Framework\Indexer\StateInterface;
* Customer model
*
* @method int getWebsiteId() getWebsiteId()
* @method Customer setWebsiteId(int)
* @method Customer setWebsiteId($value)
* @method int getStoreId() getStoreId()
* @method string getEmail() getEmail()
* @method ResourceCustomer _getResource()
......
<?php
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Ui\Component\Form\Element;
class MultiSelect extends Select
{
const NAME = 'multiselect';
const DEFAULT_SIZE = 6;
/**
* @inheritDoc
*/
public function prepare()
{
$config['size'] = self::DEFAULT_SIZE;
$this->setData('config', array_replace_recursive((array)$this->getData('config'), $config));
parent::prepare();
}
}
......@@ -199,7 +199,7 @@
</item>
</argument>
</select>
<multiselect class="Magento\Ui\Component\Form\Element\Select">
<multiselect class="Magento\Ui\Component\Form\Element\MultiSelect">
<argument name="data" xsi:type="array">
<item name="template" xsi:type="string">ui/form/element/multiselect</item>
<item name="js_config" xsi:type="array">
......@@ -209,6 +209,9 @@
<item name="elementTmpl" xsi:type="string">ui/form/element/multiselect</item>
</item>
</item>
<item name="config" xsi:type="array">
<item name="size" xsi:type="string">6</item>
</item>
</argument>
</multiselect>
<textarea class="Magento\Ui\Component\Form\Element\Textarea">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment