Skip to content

Commit 24c5815

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1630 from magento-engcom/2.2-develop-prs
#11765 Allows modules with underscores in name to add blocks to layout via XML by @bentideswell #11745 [Backport 2.2-develop] Fix label to avoid wrapping poorly,now break by word by @enriquei4 #11749 [Backport 2.2-develop] Fix datetime type product that show current date when is empty in grids by @enriquei4
2 parents 04140ba + 28679d9 commit 24c5815

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ define([
3939
getLabel: function (value, format) {
4040
var date = moment(this._super());
4141

42-
date = date.isValid() ?
42+
date = date.isValid() && value[this.index] ?
4343
date.format(format || this.dateFormat) :
4444
'';
4545

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,6 @@
13831383
line-height: 1.33;
13841384
vertical-align: middle;
13851385
white-space: normal;
1386-
word-break: break-all;
13871386

13881387
&[data-config-scope] {
13891388
position: relative;

lib/internal/Magento/Framework/View/Layout/etc/elements.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
<xs:simpleType name="blockClassType">
140140
<xs:restriction base="xs:string">
141-
<xs:pattern value="[A-Z][a-zA-Z\d]*(\\[A-Z][a-zA-Z\d]*)*"/>
141+
<xs:pattern value="[A-Z][_a-zA-Z\d]*(\\[A-Z][_a-zA-Z\d]*)*"/>
142142
</xs:restriction>
143143
</xs:simpleType>
144144

0 commit comments

Comments
 (0)