From ed601f51cccba310291bca7fe25c32140adccca5 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 31 Mar 2017 11:46:13 +0530 Subject: [PATCH] Page length always 20, frappe/erpnext#8256 --- frappe/desk/reportview.py | 3 ++- frappe/public/js/frappe/list/list_renderer.js | 2 +- frappe/public/js/frappe/list/list_view.js | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 92ca203982..e2ab217c3d 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -36,7 +36,8 @@ def get_form_params(): data["save_user_settings"] = json.loads(data["save_user_settings"]) else: data["save_user_settings"] = True - + + doctype = data["doctype"] fields = data["fields"] for field in fields: diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index eec9ac3ea4..e1660cc891 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -50,7 +50,7 @@ frappe.views.ListRenderer = Class.extend({ this.order_by = this.user_settings.order_by || this.settings.order_by; this.filters = this.user_settings.filters || this.settings.filters; - this.page_length = this.user_settings.page_length || this.settings.page_length; + this.page_length = this.settings.page_length; // default filter for submittable doctype if(frappe.model.is_submittable(this.doctype) && (!this.filters || !this.filters.length)) { diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 85a7cbcb15..219409fbd6 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -441,10 +441,11 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ different = true; } - if (user_settings.page_length !== args.page_length) { - user_settings.page_length = args.page_length || 20 - different = true; - } + // never save page_length in user_settings + // if (user_settings.page_length !== args.page_length) { + // user_settings.page_length = args.page_length || 20 + // different = true; + // } // save fields in list settings if (args.save_user_settings_fields) {