Skip to content

Commit 7af7519

Browse files
committed
Merge branch 'MAGETWO-43824' of github.corp.magento.com:magento-vanilla/magento2ce into MAGETWO-43824
2 parents 76f1939 + 5bba846 commit 7af7519

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

app/code/Magento/CatalogUrlRewrite/view/adminhtml/ui_component/category_form.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
<field name="url_key_create_redirect">
1313
<argument name="data" xsi:type="array">
1414
<item name="config" xsi:type="array">
15-
<item name="label" xsi:type="string" translate="true">Create Permanent Redirect for old URL</item>
15+
<item name="description" xsi:type="string" translate="true">Create Permanent Redirect for old URL</item>
1616
<item name="dataType" xsi:type="string">boolean</item>
1717
<item name="formElement" xsi:type="string">checkbox</item>
18-
<item name="imports" xsi:type="array">
19-
<item name="handleChanges" xsi:type="string">${ $.provider }:data.url_key</item>
20-
</item>
21-
<item name="component" xsi:type="string">Magento_Catalog/js/components/url-key-handle-changes</item>
18+
<item name="disabled" xsi:type="boolean">true</item>
2219
<item name="sortOrder" xsi:type="number">15</item>
2320
</item>
2421
</argument>

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ define([
347347
validate: function () {
348348
var value = this.value(),
349349
result = validator(this.validation, value),
350-
message = result.message,
351-
isValid = !this.visible() || result.passed;
350+
message = !this.disabled() && this.visible() ? result.message : '',
351+
isValid = this.disabled() || !this.visible() || result.passed;
352352

353353
this.error(message);
354354

0 commit comments

Comments
 (0)