From 20f514cc9ace84a7204201f04eb1c4e4cafada59 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Thu, 3 May 2012 15:10:26 +0300 Subject: [PATCH] Use page passed from jqgrid javascript plugin not one calculated by Listbox server side code which is not correct. --- .../portal_skins/erp5_xhtml_gadget_style/Listbox_asJSON.xml | 2 +- bt5/erp5_xhtml_gadget_style/bt/revision | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_style/Listbox_asJSON.xml b/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_style/Listbox_asJSON.xml index 2f03289714..6efb331c7a 100644 --- a/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_style/Listbox_asJSON.xml +++ b/bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_style/Listbox_asJSON.xml @@ -94,7 +94,7 @@ current_page_stop = (total_line < current_page_max) and total_line or current_p #context.log("%s %s %s %s %s %s" %(listbox_max_lines, total_line, current_page,\n # current_page_max, current_page_start, current_page_stop))\n \n -json = {"page": current_page,\n +json = {"page": page,\n "total": total_pages,\n "records": total_line,\n "rows":row_list}\n diff --git a/bt5/erp5_xhtml_gadget_style/bt/revision b/bt5/erp5_xhtml_gadget_style/bt/revision index 56a6051ca2..d8263ee986 100644 --- a/bt5/erp5_xhtml_gadget_style/bt/revision +++ b/bt5/erp5_xhtml_gadget_style/bt/revision @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file -- 2.30.9