Skip to content

Commit c844e10

Browse files
authored
Merge pull request #4697 from magento-trigger/MC-19684
[TR] MC-19684: Some minute values cannot be set for Analytics data collection
2 parents 80d41df + eba1d8d commit c844e10

File tree

10 files changed

+19
-69
lines changed

10 files changed

+19
-69
lines changed

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2727
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
28-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
29-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
30-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
28+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>
29+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="59" stepKey="selectAdvancedReportingMinute"/>
30+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="59" stepKey="selectAdvancedReportingSeconds"/>
3131
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
3232
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
3333
</test>

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[0]"]</selector>
21+
<selector>[name="stores[]"]</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 = "[orig-name='%s[]']";
32+
protected $customerAttribute = "[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[0]"]</selector>
14+
<selector>select[name="stores[]"]</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[0]"]</selector>
32+
<selector>[name="order_statuses[]"]</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[0]"]</selector>
26+
<selector>[name="order_statuses[]"]</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[0]"]</selector>
15+
<selector>[name="stores[]"]</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[0]"]</selector>
29+
<selector>[name="order_statuses[]"]</selector>
3030
<input>multiselect</input>
3131
</order_statuses>
3232
<show_actual_columns>

lib/web/mage/validation.js

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,6 @@
19251925
* @protected
19261926
*/
19271927
_create: function () {
1928-
this._prepareArrayInputs();
19291928
this.validate = this.element.validate(this.options);
19301929

19311930
// ARIA (adding aria-required attribute)
@@ -1938,50 +1937,6 @@
19381937
this._listenFormValidate();
19391938
},
19401939

1941-
/**
1942-
* Validation creation.
1943-
*
1944-
* @protected
1945-
*/
1946-
_prepareArrayInputs: function () {
1947-
/* Store original names for array inputs */
1948-
var originalElements = [],
1949-
originalSubmitHandler = this.options.submitHandler;
1950-
1951-
/* For all array inputs, assign index so that validation is proper */
1952-
this.element.find('[name$="[]"]').each(function (key, input) {
1953-
var originalName, name;
1954-
1955-
input = $(input);
1956-
originalName = input.attr('name');
1957-
name = originalName.replace('[]', '[' + key + ']');
1958-
$(input).attr('name', name);
1959-
$(input).attr('orig-name', originalName);
1960-
originalElements.push({
1961-
element: $(input),
1962-
name: originalName
1963-
});
1964-
});
1965-
1966-
if (originalElements.length) {
1967-
/**
1968-
* Before submitting the actual form, remove the previously assigned indices
1969-
* @param {Object} form
1970-
*/
1971-
this.options.submitHandler = function (form) {
1972-
originalElements.forEach(function (element) {
1973-
element.element.attr('name', element.name);
1974-
element.element.removeAttr('orig-name');
1975-
});
1976-
1977-
console.error(this.submit);
1978-
1979-
/* Call the originalSubmitHandler if it's a function */
1980-
typeof originalSubmitHandler === 'function' ? originalSubmitHandler(form) : form.submit();
1981-
};
1982-
}
1983-
},
1984-
19851940
/**
19861941
* Validation listening.
19871942
*

lib/web/mage/validation/validation.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,18 @@
4949
'validate-one-checkbox-required-by-name': [
5050
function (value, element, params) {
5151
var checkedCount = 0,
52-
selector,
53-
container,
54-
origNameSelector,
55-
nameSelector;
52+
container;
5653

5754
if (element.type === 'checkbox') {
58-
/* If orig-name attribute is present, use it for validation. Else use name */
59-
origNameSelector = '[orig-name="' + element.getAttribute('orig-name') + '"]';
60-
nameSelector = '[name="' + element.name + '"]';
61-
selector = element.getAttribute('orig-name') ? origNameSelector : nameSelector;
62-
$(selector).each(function () {
63-
if ($(this).is(':checked')) {
64-
checkedCount += 1;
65-
66-
return false;
55+
$('[name="' + element.name + '"]').each(
56+
function () {
57+
if ($(this).is(':checked')) {
58+
checkedCount += 1;
59+
60+
return false;
61+
}
6762
}
68-
});
63+
);
6964
}
7065
container = '#' + params;
7166

0 commit comments

Comments
 (0)