Skip to content

Commit 6dbc298

Browse files
author
Robert He
committed
Merge branch 'FearlessKiwis-MAGETWO-35027-FPT-Attribute-is-displayed-as-required-on-create-Product-Backend-page-for-countries-with-states' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop
2 parents 9f2b43b + efc9366 commit 6dbc298

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

app/code/Magento/Weee/view/adminhtml/web/js/fpt-attribute.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ define([
2727
});
2828
},
2929
_initOptionItem: function () {
30-
var widget = this;
30+
var widget = this,
31+
isOriginalRequired = $(widget.element).hasClass('required');
3132

3233
this._on({
3334
//Add new tax item
@@ -44,6 +45,7 @@ define([
4445
'change [data-role="select-country"]': function (event, data) {
4546
var currentElement = event.target || event.srcElement || event.currentTarget,
4647
parentElement = $(currentElement).closest('[data-role="fpt-item-row"]');
48+
4749
data = data || {};
4850
var updater = new RegionUpdater(
4951
parentElement.find('[data-role="select-country"]').attr('id'), null,
@@ -55,6 +57,9 @@ define([
5557
if (data.state) {
5658
parentElement.find('[data-role="select-state"]').val(data.state);
5759
}
60+
if (!isOriginalRequired && $(widget.element).hasClass('required')) {
61+
$(widget.element).removeClass('required');
62+
}
5863
}
5964
});
6065

lib/web/mage/adminhtml/form.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ RegionUpdater.prototype = {
150150
}
151151
}
152152

153+
//compute the need for the required fields
153154
if (!regionRequired || !currentElement.visible()) {
154155
if (field.hasClassName('required')) {
155156
field.removeClassName('required');

0 commit comments

Comments
 (0)