Bläddra i källkod

Merge pull request #2187 from KanchanChauhan/hide-disabled-reports

Disables reports will not show up in list view
version-14
Nabin Hait 8 år sedan
committed by GitHub
förälder
incheckning
ea09c6421f
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. +1
    -1
      frappe/public/js/frappe/list/list_sidebar.js
  2. +1
    -1
      frappe/utils/user.py

+ 1
- 1
frappe/public/js/frappe/list/list_sidebar.js Visa fil

@@ -69,7 +69,7 @@ frappe.views.ListSidebar = Class.extend({

var add_reports = function(reports) {
$.each(reports, function(name, r) {
if(!r.ref_doctype || r.ref_doctype==me.doctype) {
if(!r.ref_doctype || r.ref_doctype==me.doctype && !r.disabled) {
var report_type = r.report_type==='Report Builder'
? 'Report/' + r.ref_doctype : 'query-report';
var route = r.route || report_type + '/' + r.name;


+ 1
- 1
frappe/utils/user.py Visa fil

@@ -205,7 +205,7 @@ class UserPermissions:
return d

def get_all_reports(self):
reports = frappe.db.sql("""select name, report_type, ref_doctype from tabReport
reports = frappe.db.sql("""select name, report_type, ref_doctype, disabled from tabReport
where ref_doctype in ('{0}')""".format("', '".join(self.can_get_report)), as_dict=1)

return frappe._dict((d.name, d) for d in reports)


Laddar…
Avbryt
Spara