From 831391cbc430ab715ab74a414345c823072ca1b1 Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Mon, 27 Feb 2017 16:41:48 +0530 Subject: [PATCH 1/3] [minor] redefine tools and settings categories --- frappe/public/js/frappe/ui/toolbar/search.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js index b110404cb4..779d666c28 100644 --- a/frappe/public/js/frappe/ui/toolbar/search.js +++ b/frappe/public/js/frappe/ui/toolbar/search.js @@ -558,7 +558,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ this.section_length = 4; this.set_nav_results(me.keywords); - var types = ["Lists", "Reports", "Pages", "Modules"]; + var types = ["Lists", "Reports", "Modules", "Tools", "Settings"]; types.forEach(function(type) { if(me.nav_results[type].length > 0) { me.types.push(type); @@ -574,16 +574,25 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ }, set_nav_results: function(keywords) { - var me = this; + var me = this, lists = [], settings = []; this.awesome_bar = new frappe.search.AwesomeBar(); var compare = function(a, b) { return a.index - b.index; } + var all_doctypes = me.awesome_bar.get_doctypes(keywords); + all_doctypes.forEach(function(d) { + if(d.type === "") { + settings.push(d); + } else { + lists.push(d); + } + }); this.nav_results = { - "Lists": me.awesome_bar.get_doctypes(keywords).sort(compare), + "Lists": lists.sort(compare), "Reports": me.awesome_bar.get_reports(keywords).sort(compare), - "Pages": me.awesome_bar.get_pages(keywords).sort(compare), - "Modules": me.awesome_bar.get_modules(keywords).sort(compare) + "Modules": me.awesome_bar.get_modules(keywords).sort(compare), + "Tools": me.awesome_bar.get_pages(keywords).sort(compare), + "Settings": settings.sort(compare) } }, From fa4a7bd2091e1e372550773a206cb873848355ac Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Mon, 27 Feb 2017 18:33:32 +0530 Subject: [PATCH 2/3] [minor] term fix --- frappe/public/js/frappe/ui/toolbar/search.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js index 779d666c28..f2d8a7a99f 100644 --- a/frappe/public/js/frappe/ui/toolbar/search.js +++ b/frappe/public/js/frappe/ui/toolbar/search.js @@ -558,7 +558,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ this.section_length = 4; this.set_nav_results(me.keywords); - var types = ["Lists", "Reports", "Modules", "Tools", "Settings"]; + var types = ["Lists", "Reports", "Modules", "Tools", "Setup"]; types.forEach(function(type) { if(me.nav_results[type].length > 0) { me.types.push(type); @@ -574,7 +574,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ }, set_nav_results: function(keywords) { - var me = this, lists = [], settings = []; + var me = this, lists = [], setup = []; this.awesome_bar = new frappe.search.AwesomeBar(); var compare = function(a, b) { return a.index - b.index; @@ -582,7 +582,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ var all_doctypes = me.awesome_bar.get_doctypes(keywords); all_doctypes.forEach(function(d) { if(d.type === "") { - settings.push(d); + setup.push(d); } else { lists.push(d); } @@ -592,7 +592,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ "Reports": me.awesome_bar.get_reports(keywords).sort(compare), "Modules": me.awesome_bar.get_modules(keywords).sort(compare), "Tools": me.awesome_bar.get_pages(keywords).sort(compare), - "Settings": settings.sort(compare) + "Setup": setup.sort(compare) } }, From c5899afea2cf1d0bcf61500e77ff124fc5a921a5 Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Mon, 27 Feb 2017 18:59:58 +0530 Subject: [PATCH 3/3] [minor] yet another term change --- frappe/public/js/frappe/ui/toolbar/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js index f2d8a7a99f..c8da293e63 100644 --- a/frappe/public/js/frappe/ui/toolbar/search.js +++ b/frappe/public/js/frappe/ui/toolbar/search.js @@ -558,7 +558,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ this.section_length = 4; this.set_nav_results(me.keywords); - var types = ["Lists", "Reports", "Modules", "Tools", "Setup"]; + var types = ["Lists", "Reports", "Modules", "Administration", "Setup"]; types.forEach(function(type) { if(me.nav_results[type].length > 0) { me.types.push(type); @@ -591,7 +591,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({ "Lists": lists.sort(compare), "Reports": me.awesome_bar.get_reports(keywords).sort(compare), "Modules": me.awesome_bar.get_modules(keywords).sort(compare), - "Tools": me.awesome_bar.get_pages(keywords).sort(compare), + "Administration": me.awesome_bar.get_pages(keywords).sort(compare), "Setup": setup.sort(compare) } },