Skip to content

Commit eadcff2

Browse files
committed
fix static-funk #15383
1 parent ee288c1 commit eadcff2

File tree

12 files changed

+23
-17
lines changed

12 files changed

+23
-17
lines changed

dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/Block/Agreement/Edit/AgreementsForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<input>select</input>
1919
</mode>
2020
<stores>
21-
<selector>[name="stores[]"]</selector>
21+
<selector>[name="stores[0]"]</selector>
2222
<input>multiselectgrouplist</input>
2323
</stores>
2424
<checkbox_text />

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CustomerForm extends Form
2929
*
3030
* @var string
3131
*/
32-
protected $customerAttribute = "[name='%s[]']";
32+
protected $customerAttribute = "[orig-name='%s[]']";
3333

3434
/**
3535
* Validation text message for a field.

dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<selector>input[name='start_at']</selector>
1212
</queue_start_at>
1313
<stores>
14-
<selector>select[name="stores[]"]</selector>
14+
<selector>select[name="stores[0]"]</selector>
1515
<input>multiselectgrouplist</input>
1616
</stores>
1717
<newsletter_subject>

dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Coupons/Filter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<input>select</input>
3030
</price_rule_type>
3131
<order_statuses>
32-
<selector>[name="order_statuses[]"]</selector>
32+
<selector>[name="order_statuses[0]"]</selector>
3333
<input>multiselect</input>
3434
</order_statuses>
3535
<rules_list>

dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/TaxRule/Filter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<input>select</input>
2424
</show_order_statuses>
2525
<order_statuses>
26-
<selector>[name="order_statuses[]"]</selector>
26+
<selector>[name="order_statuses[0]"]</selector>
2727
<input>multiselect</input>
2828
</order_statuses>
2929
<show_empty_rows>

dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Rating/Edit/RatingForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<strategy>css selector</strategy>
1313
<fields>
1414
<stores>
15-
<selector>[name="stores[]"]</selector>
15+
<selector>[name="stores[0]"]</selector>
1616
<input>multiselectgrouplist</input>
1717
</stores>
1818
<is_active>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Report/Filter/Form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<input>select</input>
2727
</show_order_statuses>
2828
<order_statuses>
29-
<selector>[name="order_statuses[]"]</selector>
29+
<selector>[name="order_statuses[0]"]</selector>
3030
<input>multiselect</input>
3131
</order_statuses>
3232
<show_actual_columns>

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyComparedProducts.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</page_size>
1313
<show_attributes>
1414
<selector>
15-
.control [name="parameters[show_attributes][]"]
15+
.control [name="parameters[show_attributes][1]"]
1616
</selector>
1717
<input>multiselect</input>
1818
</show_attributes>
1919
<show_buttons>
2020
<selector>
21-
.control [name="parameters[show_buttons][]"]
21+
.control [name="parameters[show_buttons][2]"]
2222
</selector>
2323
<input>multiselect</input>
2424
</show_buttons>

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/ParametersType/RecentlyViewedProducts.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</page_size>
1313
<show_attributes>
1414
<selector>
15-
.control [name="parameters[show_attributes][]"]
15+
.control [name="parameters[show_attributes][1]"]
1616
</selector>
1717
<input>multiselect</input>
1818
</show_attributes>
1919
<show_buttons>
2020
<selector>
21-
.control [name="parameters[show_buttons][]"]
21+
.control [name="parameters[show_buttons][2]"]
2222
</selector>
2323
<input>multiselect</input>
2424
</show_buttons>

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/WidgetForm.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<page_size />
3333
<show_attributes>
3434
<selector>
35-
.control [name="parameters[show_attributes][]"]
35+
.control [name="parameters[show_attributes][1]"]
3636
</selector>
3737
<input>multiselect</input>
3838
</show_attributes>
3939
<show_buttons>
4040
<selector>
41-
.control [name="parameters[show_buttons][]"]
41+
.control [name="parameters[show_buttons][2]"]
4242
</selector>
4343
<input>multiselect</input>
4444
</show_buttons>

lib/web/mage/validation.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,13 +1945,14 @@
19451945
* Before submitting the actual form, remove the previously assigned indices
19461946
* @param {Object} form
19471947
*/
1948-
this.options.submitHandler = function (form, event) {
1948+
this.options.submitHandler = function (form) {
19491949
originalElements.forEach(function (element) {
19501950
element.element.attr('name', element.name);
19511951
element.element.removeAttr('orig-name');
19521952
});
19531953

1954-
console.error(this.submit)
1954+
console.error(this.submit);
1955+
19551956
/* Call the originalSubmitHandler if it's a function */
19561957
typeof originalSubmitHandler === 'function' ? originalSubmitHandler(form) : form.submit();
19571958
};
@@ -1960,6 +1961,7 @@
19601961

19611962
/**
19621963
* Validation listening.
1964+
*
19631965
* @protected
19641966
*/
19651967
_listenFormValidate: function () {

lib/web/mage/validation/validation.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@
5050
function (value, element, params) {
5151
var checkedCount = 0,
5252
selector,
53-
container;
53+
container,
54+
origNameSelector,
55+
nameSelector;
5456

5557
if (element.type === 'checkbox') {
5658
/* If orig-name attribute is present, use it for validation. Else use name */
57-
selector = element.getAttribute('orig-name') ? '[orig-name="' + element.getAttribute('orig-name') + '"]' : '[name="' + element.name + '"]';
59+
origNameSelector = '[orig-name="' + element.getAttribute('orig-name') + '"]';
60+
nameSelector = '[name="' + element.name + '"]';
61+
selector = element.getAttribute('orig-name') ? origNameSelector : nameSelector;
5862
$(selector).each(function () {
5963
if ($(this).is(':checked')) {
6064
checkedCount += 1;

0 commit comments

Comments
 (0)