From d66352db623407030defbb727f6ff7f628bc6390 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 17 Feb 2015 15:53:38 +0530 Subject: [PATCH] [fix] load query report --- frappe/public/js/frappe/assets.js | 5 +++-- frappe/public/js/frappe/defaults.js | 8 ++++---- frappe/public/js/frappe/misc/user.js | 2 +- frappe/public/js/frappe/views/reports/query_report.js | 2 -- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js index 4f8452817d..fcdbf3a912 100644 --- a/frappe/public/js/frappe/assets.js +++ b/frappe/public/js/frappe/assets.js @@ -148,11 +148,12 @@ frappe.assets = { }, "Calendar": function() { frappe.assets.views["List"](); - // frappe.assets.views["Report"](); }, "Gantt": function() { frappe.assets.views["List"](); - // frappe.assets.views["Report"](); }, + "query-report": function() { + frappe.assets.views["Report"](); + } } }; diff --git a/frappe/public/js/frappe/defaults.js b/frappe/public/js/frappe/defaults.js index 886b2c2bca..ea89a21ad5 100644 --- a/frappe/public/js/frappe/defaults.js +++ b/frappe/public/js/frappe/defaults.js @@ -23,9 +23,9 @@ frappe.defaults = { return d; }, set_default: function(key, value, callback) { - if(typeof value=="string") + if(typeof value!=="string") value = JSON.stringify(value); - + frappe.boot.user.defaults[key] = value; return frappe.call({ method: "frappe.client.set_default", @@ -43,7 +43,7 @@ frappe.defaults = { return JSON.parse(value) } catch(e) { return value; - } + } } }, get_user_permissions: function() { @@ -53,4 +53,4 @@ frappe.defaults = { if(!user_permissions) return; frappe.defaults.user_permissions = $.extend(frappe.defaults.user_permissions || {}, user_permissions); } -} \ No newline at end of file +} diff --git a/frappe/public/js/frappe/misc/user.js b/frappe/public/js/frappe/misc/user.js index 572147a010..20bf0c2ca9 100644 --- a/frappe/public/js/frappe/misc/user.js +++ b/frappe/public/js/frappe/misc/user.js @@ -77,7 +77,7 @@ $.extend(frappe.user, { // add missing modules - they will be hidden anyways by the view $.each(frappe.modules, function(m, module) { var module = frappe.get_module(m); - if(modules_list.indexOf(m)==-1) { + if(modules_list.indexOf(m)===-1) { modules_list.push(m); } }); diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index bb1dfc8f90..e6615f0fd5 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -7,8 +7,6 @@ frappe.provide("frappe.query_reports"); frappe.standard_pages["query-report"] = function() { var wrapper = frappe.container.add_page('query-report'); - frappe.assets.views["Report"](); - frappe.ui.make_app_page({ parent: wrapper, title: __('Query Report'),