vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1669 from nabinhait/awesome_bar_report_fix

Browse source 
[fix] Route for report builder report from awesome bar
This commit is contained in:
Anand Doshi 2016-04-04 17:37:42 +05:30
commit e70a89cd6c
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/public/js/frappe/ui/toolbar/awesome_bar.js
View file

@ -221,11 +221,17 @@ frappe.search.verbs = [
// reports
function(txt) {
frappe.search.find(keys(frappe.boot.user.all_reports), txt, function(match) {
var report_type = frappe.boot.user.all_reports[match];
var report = frappe.boot.user.all_reports[match];
var route = [];
if(report.report_type == "Report Builder")
route = ["Report", report.ref_doctype, match];
else
route = ["query-report", match];
return {
label: __("Report {0}", ["<b>"+__(match)+"</b>"]),
value: __("Report {0}", [__(match)]),
route: [report_type=="Report Builder" ? "Report" : "query-report", match]
route: route
}
});
},

11
frappe/utils/user.py
View file

@ -145,9 +145,6 @@ class UserPermissions:
self.can_import = frappe.db.sql_list("""select name from `tabDocType`
where allow_import = 1""")
self.all_reports = frappe.db.sql("""select name, report_type from tabReport
where ref_doctype in ('{0}')""".format("', '".join(self.can_get_report)))
def get_defaults(self):
import frappe.defaults
self.defaults = frappe.defaults.get_defaults(self.name)
@ -204,8 +201,14 @@ class UserPermissions:
d[key] = list(set(getattr(self, key)))
d.all_reports = dict(self.all_reports)
d.all_reports = self.get_all_reports()
return d
def get_all_reports(self):
reports = frappe.db.sql("""select name, report_type, ref_doctype 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)
def get_user_fullname(user):
fullname = frappe.db.sql("SELECT CONCAT_WS(' ', first_name, last_name) FROM `tabUser` WHERE name=%s", (user,))