浏览代码

Merge pull request #2984 from netchampfaris/ui-fixes

Page length always 20
version-14
Nabin Hait 8 年前
committed by GitHub
父节点
当前提交
12ce0c1db5
共有 3 个文件被更改,包括 8 次插入6 次删除
  1. +2
    -1
      frappe/desk/reportview.py
  2. +1
    -1
      frappe/public/js/frappe/list/list_renderer.js
  3. +5
    -4
      frappe/public/js/frappe/list/list_view.js

+ 2
- 1
frappe/desk/reportview.py 查看文件

@@ -36,7 +36,8 @@ def get_form_params():
data["save_user_settings"] = json.loads(data["save_user_settings"]) data["save_user_settings"] = json.loads(data["save_user_settings"])
else: else:
data["save_user_settings"] = True data["save_user_settings"] = True

doctype = data["doctype"]
fields = data["fields"] fields = data["fields"]


for field in fields: for field in fields:


+ 1
- 1
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.order_by = this.user_settings.order_by || this.settings.order_by;
this.filters = this.user_settings.filters || this.settings.filters; 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 // default filter for submittable doctype
if(frappe.model.is_submittable(this.doctype) && (!this.filters || !this.filters.length)) { if(frappe.model.is_submittable(this.doctype) && (!this.filters || !this.filters.length)) {


+ 5
- 4
frappe/public/js/frappe/list/list_view.js 查看文件

@@ -441,10 +441,11 @@ frappe.views.ListView = frappe.ui.BaseList.extend({
different = true; 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 // save fields in list settings
if (args.save_user_settings_fields) { if (args.save_user_settings_fields) {


正在加载...
取消
保存