File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed
app/code/Magento/Catalog/etc Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 29
29
<attribute code =" price_type" >
30
30
<field code =" is_searchable" locked =" true" />
31
31
</attribute >
32
+ <attribute code =" name" >
33
+ <field code =" is_html_allowed_on_front" locked =" true" />
34
+ </attribute >
32
35
<attribute code =" category_ids" >
33
36
<field code =" is_searchable" locked =" true" />
34
37
<field code =" used_for_sort_by" locked =" true" />
Original file line number Diff line number Diff line change @@ -438,7 +438,7 @@ define([
438
438
isInArray = values . indexOf ( from . value ) != - 1 ; //eslint-disable-line
439
439
isNegative = valuesFrom [ idFrom ] . negative ;
440
440
441
- if ( ! from || isInArray && isNegative || ! isInArray && ! isNegative ) {
441
+ if ( ! from || isInArray && isNegative || ! isInArray && ! isNegative ) {
442
442
shouldShowUp = false ;
443
443
}
444
444
}
@@ -488,8 +488,13 @@ define([
488
488
489
489
if ( isAnInputOrSelect && ! isInheritCheckboxChecked ) {
490
490
if ( target ) {
491
- target . disabled = false ;
491
+ if ( target . getAttribute ( 'readonly' ) ) {
492
+ target . disabled = true ;
493
+ } else {
494
+ target . disabled = false ;
495
+ }
492
496
}
497
+
493
498
jQuery ( '#' + idTo ) . removeClass ( 'ignore-validate' ) ;
494
499
}
495
500
}
You can’t perform that action at this time.
0 commit comments