(ofbiz-framework) branch release18.12 updated: Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 - #637)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 362538d18f Fixed: pagination, jump to page with AJAX enabled is broken 
(OFBIZ-12817 - #637)
362538d18f is described below

commit 362538d18fa456a7d5565410cb1c2c47b35bcaf2
Author: Florian Motteau <florian.mott...@nereide.fr>
AuthorDate: Fri Feb 16 08:44:12 2024 +0100

    Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 - 
#637)
    
    Jump to page with AJAX enabled fetches the wrong page.
    We need to decrement the value entered by the user by one (page numbers are 
zero-indexed)
    
    Thanks: Néréide Team :)
    
    Conflict handled by hand
---
 .../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 0884a5324a..6f7ce8026a 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -2452,7 +2452,8 @@ public final class MacroFormRenderer implements 
FormStringRenderer {
         // Page select dropdown
         if (listSize > 0 && this.javaScriptEnabled) {
             if (ajaxEnabled) {
-                ajaxSelectUrl = createAjaxParamsFromUpdateAreas(updateAreas, 
prepLinkText + "' + this.value + '", context);
+                ajaxSelectUrl = 
MacroCommonRenderer.createAjaxParamsFromUpdateAreas(updateAreas, null, 
modelForm,
+                        prepLinkText + "' + (this.value - 1) + '", context);
             } else {
                 linkText = prepLinkText;
                 if (linkText.startsWith("/")) {