Browse Source

[merge] hotfix

version-14
Rushabh Mehta 8 years ago
parent
commit
3d78cabfe9
3 changed files with 15 additions and 2 deletions
  1. +1
    -0
      frappe/public/js/frappe/list/list_view.js
  2. +4
    -2
      frappe/public/js/frappe/ui/base_list.js
  3. +10
    -0
      frappe/public/js/frappe/views/reports/query_report.js

+ 1
- 0
frappe/public/js/frappe/list/list_view.js View File

@@ -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
- 2
frappe/public/js/frappe/ui/base_list.js View File

@@ -186,8 +186,10 @@ frappe.ui.BaseList = Class.extend({


if (this.meta) { if (this.meta) {
var filter_count = 1; var filter_count = 1;
$(`<span class="octicon octicon-search text-muted small"></span>`)
.appendTo(this.page.page_form);
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 View File

@@ -365,6 +365,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;




Loading…
Cancel
Save