Skip to content

Commit e9b525a

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #18967: fixed - Magento 2.2.6 Default values are not rendering on Wishlist product edit page (by @webkul-ratnesh) - #18873: [Backport] Prevent exception when option text converts to false (by @gelanivishal) - #18875: [Backport] Sections LESS mixins: fix the issue with missing rules and incorrect default variables (by @gelanivishal) Fixed GitHub Issues: - #18555: Magento 2.2.6 Default values are not rendering on Wishlist product edit page. (reported by @kirtinariya1) has been fixed in #18967 by @webkul-ratnesh in 2.2-develop branch Related commits: 1. 2bb0329 - #13083: OptionManagement.validateOption throws NoSuchEntityException for "0" option label (reported by @rzinnatullin) has been fixed in #18873 by @gelanivishal in 2.2-develop branch Related commits: 1. 06ca13a - #18729: Bug in "_sections.less" mixins: missing rules and incorrect default variables (reported by @dmytro-ch) has been fixed in #18875 by @gelanivishal in 2.2-develop branch Related commits: 1. 999e79f 2. 5333810
2 parents 38bc4bf + 6846cd3 commit e9b525a

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ define([
6161
this.setProductOptions(cartData());
6262
this.updateOptions();
6363
}.bind(this));
64+
this.updateOptions();
6465
},
6566

6667
/**

app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function getItems($entityType, $attributeCode)
132132
*/
133133
protected function validateOption($attribute, $optionId)
134134
{
135-
if (!$attribute->getSource()->getOptionText($optionId)) {
135+
if ($attribute->getSource()->getOptionText($optionId) === false) {
136136
throw new NoSuchEntityException(
137137
__('Attribute %1 does not contain option with Id %2', $attribute->getAttributeCode(), $optionId)
138138
);

lib/web/css/source/lib/_sections.less

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
@_tab-control-color: @tab-control__color,
5050
@_tab-control-text-decoration: @tab-control__text-decoration,
5151

52-
@_tab-control-color-visited: @tab-control__color,
53-
@_tab-control-text-decoration-visited: @tab-control__text-decoration,
52+
@_tab-control-color-visited: @tab-control__visited__color,
53+
@_tab-control-text-decoration-visited: @tab-control__visited__text-decoration,
5454

5555
@_tab-control-background-color-hover: @tab-control__hover__background-color,
5656
@_tab-control-color-hover: @tab-control__hover__color,
57-
@_tab-control-text-decoration-hover: @tab-control__text-decoration,
57+
@_tab-control-text-decoration-hover: @tab-control__hover__text-decoration,
5858

5959
@_tab-control-background-color-active: @tab-control__active__background-color,
6060
@_tab-control-color-active: @tab-control__active__color,
61-
@_tab-control-text-decoration-active: @tab-control__text-decoration,
61+
@_tab-control-text-decoration-active: @tab-control__active__text-decoration,
6262

6363
@_tab-control-height: @tab-control__height,
6464
@_tab-control-margin-right: @tab-control__margin-right,
@@ -121,6 +121,7 @@
121121
&.active > .switch:hover {
122122
.lib-css(background, @_tab-control-background-color-active);
123123
.lib-css(color, @_tab-control-color-active);
124+
.lib-css(text-decoration, @_tab-control-text-decoration-active);
124125
}
125126

126127
&.active > .switch,
@@ -200,8 +201,8 @@
200201
@_accordion-control-color: @accordion-control__color,
201202
@_accordion-control-text-decoration: @accordion-control__text-decoration,
202203

203-
@_accordion-control-color-visited: @accordion-control__color,
204-
@_accordion-control-text-decoration-visited: @accordion-control__text-decoration,
204+
@_accordion-control-color-visited: @accordion-control__visited__color,
205+
@_accordion-control-text-decoration-visited: @accordion-control__visited__text-decoration,
205206

206207
@_accordion-control-background-color-hover: @accordion-control__hover__background-color,
207208
@_accordion-control-color-hover: @accordion-control__hover__color,
@@ -275,6 +276,8 @@
275276
&.active > .switch:focus,
276277
&.active > .switch:hover {
277278
.lib-css(background, @_accordion-control-background-color-active);
279+
.lib-css(color, @_accordion-control-color-active);
280+
.lib-css(text-decoration, @_accordion-control-text-decoration-active);
278281
.lib-css(padding-bottom, @_accordion-control-padding-bottom);
279282
}
280283
}

lib/web/css/source/lib/variables/_sections.less

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
@tab-control__active__color: @text__color;
4141
@tab-control__active__text-decoration: @tab-control__text-decoration;
4242

43+
@tab-control__visited__color: @tab-control__color;
44+
@tab-control__visited__text-decoration: @tab-control__text-decoration;
45+
4346
@tab-content__background-color: @tab-control__active__background-color;
4447
@tab-content__border-top-status: false;
4548
@tab-content__border: @tab-control__border-width solid @tab-control__border-color;
@@ -72,8 +75,8 @@
7275
@accordion-control__padding-bottom: @tab-control__padding-bottom;
7376
@accordion-control__padding-left: @accordion-control__padding-right;
7477

75-
@accordion-control__visited__color: @accordion-control__color;
76-
@accordion-control__visited__text-decoration: @accordion-control__text-decoration;
78+
@accordion-control__visited__color: @tab-control__visited__color;
79+
@accordion-control__visited__text-decoration: @tab-control__visited__text-decoration;
7780

7881
@accordion-control__hover__background-color: @tab-control__hover__background-color;
7982
@accordion-control__hover__color: @tab-control__hover__color;

0 commit comments

Comments
 (0)