Skip to content

Commit e6e8b7f

Browse files
committed
Merge remote-tracking branch 'origin/AC-6922_v1' into Hammer_Regression_issues_07Feb23
2 parents 274f5b0 + 08f98be commit e6e8b7f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

app/code/Magento/Ui/view/base/web/js/grid/data-storage.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ define([
186186
delay = this.cachedRequestDelay,
187187
result;
188188

189+
if (request.showTotalRecords === undefined) {
190+
request.showTotalRecords = true;
191+
}
192+
189193
result = {
190194
items: this.getByIds(request.ids),
191195
totalRecords: request.totalRecords,
@@ -215,6 +219,10 @@ define([
215219
this.removeRequest(cached);
216220
}
217221

222+
if (data.showTotalRecords === undefined) {
223+
data.showTotalRecords = true;
224+
}
225+
218226
this._requests.push({
219227
ids: this.getIds(data.items),
220228
params: params,

package.json.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"grunt-contrib-connect": "~3.0.0",
1818
"grunt-contrib-cssmin": "~4.0.0",
1919
"grunt-contrib-imagemin": "~4.0.0",
20-
"grunt-contrib-jasmine": "~3.0.0",
20+
"grunt-contrib-jasmine": "~4.0.0",
2121
"grunt-contrib-less": "~2.1.0",
2222
"grunt-contrib-watch": "~1.1.0",
2323
"grunt-eslint": "~24.0.0",

0 commit comments

Comments
 (0)