Merge branch 'main' of https://github.com/rappen/Rappen.XTB.Helper

rappen · Jun 2, 2024 · 3a8f794 · 3a8f794
2 parents 55c8799 + 707aaf9
commit 3a8f794
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Rappen.XRM.Helpers/Extensions/QueryExtensions.cs b/Rappen.XRM.Helpers/Extensions/QueryExtensions.cs
@@ -28,7 +28,7 @@ public static void NavigatePage(this QueryBase query, string cookie, int diffpag
                     }
                     pageno = pageno + diffpage;
                     fetchnode.SetAttribute("page", pageno.ToString());
-                    fetchnode.SetAttribute("pagingcookie", cookie);
+                    fetchnode.SetAttribute("paging-cookie", cookie);
                     fex.Query = pagedoc.OuterXml;
                 }
             }

diff --git a/Rappen.XRM.Helpers/Extensions/ServiceExtensions.cs b/Rappen.XRM.Helpers/Extensions/ServiceExtensions.cs
@@ -150,7 +150,7 @@ public static EntityCollection RetrieveMultipleAll(this IOrganizationService ser
             do
             {
                 page++;
-                if (page != 1 || showMessageOnFirstPage)
+                if (worker?.WorkerReportsProgress == true && (page != 1 || showMessageOnFirstPage))
                 {
                     worker?.ReportProgress(0, GetProgress(message, resultCollection?.Entities?.Count ?? 0, pagesize, page, sw));
                 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 do
                 {
                     page++;
-                    if (page != 1 || showMessageOnFirstPage)
+                    if (worker?.WorkerReportsProgress == true && (page != 1 || showMessageOnFirstPage))
                     {
                         worker?.ReportProgress(0, GetProgress(message, resultCollection?.Entities?.Count ?? 0, pagesize, page, sw));
                     }
@@ Expand Down @@