浏览代码

Merge branch 'hotfix'

version-14
mbauskar 8 年前
父节点
当前提交
a825342f75
共有 4 个文件被更改,包括 16 次插入1 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -0
      frappe/public/js/frappe/list/list_view.js
  3. +4
    -0
      frappe/public/js/frappe/ui/base_list.js
  4. +10
    -0
      frappe/public/js/frappe/views/reports/query_report.js

+ 1
- 1
frappe/__init__.py 查看文件

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template


__version__ = '8.7.10'
__version__ = '8.7.11'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 0
frappe/public/js/frappe/list/list_view.js 查看文件

@@ -127,6 +127,7 @@ frappe.views.ListView = frappe.ui.BaseList.extend({
return; return;
} }


this.is_list_view = true;
this.page_name = 'List/' + this.doctype; this.page_name = 'List/' + this.doctype;
this.dirty = true; this.dirty = true;
this.tags_shown = false; this.tags_shown = false;


+ 4
- 0
frappe/public/js/frappe/ui/base_list.js 查看文件

@@ -185,6 +185,10 @@ frappe.ui.BaseList = Class.extend({
} }


if (this.meta) { if (this.meta) {
if(this.is_list_view) {
$(`<span class="octicon octicon-search text-muted small"></span>`)
.prependTo(this.page.page_form);
}
this.page.add_field({ this.page.add_field({
fieldtype: 'Data', fieldtype: 'Data',
label: 'ID', label: 'ID',


+ 10
- 0
frappe/public/js/frappe/views/reports/query_report.js 查看文件

@@ -364,6 +364,16 @@ frappe.views.QueryReport = Class.extend({
} }
}, },
refresh: function() { refresh: function() {
// throttle
// stop refresh from being called multiple times (from triggers ?)
if (!this.request_refresh) {
this.request_refresh = setTimeout(() => {
this._refresh();
this.request_refresh = null;
}, 300);
}
},
_refresh: function() {
// Run // Run
var me = this; var me = this;




正在加载...
取消
保存