Merge pull request #8605 from infor-design/1672-editing-error

1672 - Fix errors editing on second page
infor-design · Apr 8, 2024 · 8ecd89f · 8ecd89f
2 parents 0859ec2 + 33bf53e
commit 8ecd89f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -10,6 +10,7 @@
 ## v4.95.0 Fixes
 
 - `[Contextual Action Panel]` Fixed added padding on contextual action panel. ([#8553](https://github.com/infor-design/enterprise/issues/8553))
+- `[Datagrid]` Fixed an error editing on non first page in server side paging datagrid. ([#8537](https://github.com/infor-design/enterprise-ng/issues/1672))
 - `[Forms]` Fixed fileupload layout in compact form. ([#8537](https://github.com/infor-design/enterprise/issues/8537))
 - `[Cards]` Fixed title and button regression and position. ([#8602](https://github.com/infor-design/enterprise/issues/8602))
 

diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js
@@ -11468,7 +11468,7 @@ Datagrid.prototype = {
       dataRowIndex = row;
     }
 
-    if (!isTreeGrid && this.settings.paging && this.pagerAPI.activePage > 1) {
+    if (!isTreeGrid && this.settings.paging && this.pagerAPI.activePage > 1 && !this.settings.source) {
       if (dataRowIndex < (this.pagerAPI.activePage - 1) * this.settings.pagesize) {
         dataRowIndex += (this.pagerAPI.activePage - 1) * this.settings.pagesize;
       }