Skip to content

Commit 2004134

Browse files
magento2-login-as-customer/issues/90: Integration tests fix.
1 parent 4bcb14e commit 2004134

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/customer_form.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9-
<argument name="data" xsi:type="array">
10-
<item name="buttons" xsi:type="array">
11-
<item name="login_as_customer" xsi:type="string">Magento\LoginAsCustomer\Block\Adminhtml\Customer\Edit\Login</item>
12-
</item>
13-
</argument>
8+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
10+
<settings>
11+
<buttons>
12+
<button name="login_as_customer" class="Magento\LoginAsCustomer\Block\Adminhtml\Customer\Edit\Login"/>
13+
</buttons>
14+
</settings>
1415
</form>

app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/manual_store_form.xml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,40 +35,45 @@
3535
</dataProvider>
3636
</dataSource>
3737

38-
<fieldset name="websites" class="Magento\Store\Ui\Component\Form\Fieldset\Websites">
39-
<argument name="data" xsi:type="array">
40-
<item name="config" xsi:type="array">
41-
<item name="collapsible" xsi:type="boolean">false</item>
42-
<item name="label" xsi:type="string" translate="true">Stores</item>
43-
<item name="sortOrder" xsi:type="number">50</item>
44-
</item>
45-
</argument>
46-
<field name="entity_id">
38+
<fieldset name="websites" class="Magento\Store\Ui\Component\Form\Fieldset\Websites" sortOrder="50">
39+
<settings>
40+
<label translate="true">Stores</label>
41+
<collapsible>false</collapsible>
42+
</settings>
43+
<field name="entity_id" formElement="input">
4744
<argument name="data" xsi:type="array">
4845
<item name="config" xsi:type="array">
49-
<item name="visible" xsi:type="boolean">false</item>
50-
<item name="dataType" xsi:type="string">text</item>
51-
<item name="formElement" xsi:type="string">input</item>
5246
<item name="source" xsi:type="string">page</item>
53-
<item name="dataScope" xsi:type="string">entity_id</item>
5447
</item>
5548
</argument>
49+
<settings>
50+
<visible>false</visible>
51+
<dataType>text</dataType>
52+
<dataScope>entity_id</dataScope>
53+
</settings>
5654
</field>
57-
<field name="storeviews">
55+
<field name="storeviews" formElement="select">
5856
<argument name="data" xsi:type="array">
59-
<item name="options" xsi:type="object">Magento\Cms\Ui\Component\Listing\Column\Cms\Options</item>
6057
<item name="config" xsi:type="array">
61-
<item name="dataType" xsi:type="string">int</item>
62-
<item name="label" xsi:type="string" translate="true">Store View</item>
63-
<item name="formElement" xsi:type="string">select</item>
6458
<item name="source" xsi:type="string">page</item>
65-
<item name="dataScope" xsi:type="string">store_id</item>
6659
<item name="default" xsi:type="string">0</item>
67-
<item name="validation" xsi:type="array">
68-
<item name="required-entry" xsi:type="boolean">true</item>
69-
</item>
7060
</item>
7161
</argument>
62+
<settings>
63+
<label translate="true">Store View</label>
64+
<dataType>int</dataType>
65+
<dataScope>store_id</dataScope>
66+
<validation>
67+
<rule name="required-entry" xsi:type="boolean">true</rule>
68+
</validation>
69+
</settings>
70+
<formElements>
71+
<select>
72+
<settings>
73+
<options class="Magento\Cms\Ui\Component\Listing\Column\Cms\Options"/>
74+
</settings>
75+
</select>
76+
</formElements>
7277
</field>
7378
</fieldset>
7479
</form>

0 commit comments

Comments
 (0)