Skip to content

Commit b390547

Browse files
Merge remote-tracking branch 'remotes/github/MAGETWO-62411' into EPAM-PR-42
2 parents f8b70f9 + f63fc3d commit b390547

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@ private function addAdvancedPriceLink()
389389
'componentType' => Container::NAME,
390390
'component' => 'Magento_Ui/js/form/components/button',
391391
'template' => 'ui/form/components/button/container',
392+
'imports' => [
393+
'childError' => $this->scopeName . '.advanced_pricing_modal.advanced-pricing:error',
394+
],
392395
'actions' => [
393396
[
394397
'targetName' => $this->scopeName . '.advanced_pricing_modal',

app/code/Magento/Ui/view/base/web/js/form/components/button.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ define([
4545
.observe([
4646
'visible',
4747
'disabled',
48-
'title'
48+
'title',
49+
'childError'
4950
]);
5051
},
5152

app/code/Magento/Ui/view/base/web/templates/form/element/button.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,15 @@
1111
attr="'data-index': index">
1212
<span text="title"/>
1313
</button>
14+
15+
<if args="childError">
16+
<strong class="_error">
17+
<span class="admin__page-nav-item-messages">
18+
<span class="admin__page-nav-item-message _error">
19+
<span class="admin__page-nav-item-message-icon"></span>
20+
<span class="admin__page-nav-item-message-tooltip"
21+
data-bind="i18n: 'This element contains invalid data. Please resolve this before saving.'">This element contains invalid data. Please resolve this before saving.</span>
22+
</span>
23+
</span>
24+
</strong>
25+
</if>

0 commit comments

Comments
 (0)