Browse Source

uppercase match

version-14
pratu16x7 8 years ago
parent
commit
5d0a3ef5a8
2 changed files with 8 additions and 5 deletions
  1. +6
    -5
      frappe/public/js/frappe/ui/toolbar/awesome_bar.js
  2. +2
    -0
      frappe/website/router.py

+ 6
- 5
frappe/public/js/frappe/ui/toolbar/awesome_bar.js View File

@@ -259,8 +259,10 @@ frappe.search.AwesomeBar = Class.extend({
this.recent = JSON.parse(frappe.boot.user.recent || "[]") || []; this.recent = JSON.parse(frappe.boot.user.recent || "[]") || [];
}, },


fuzzy_search: function(txt, _item) {
item = __(_item || '').replace(/-/g, " ");
fuzzy_search: function(_txt, _item) {
parsed_item = __(_item || '').replace(/-/g, " ");
item = parsed_item.toLowerCase();
txt = _txt.toLowerCase();


var ilen = item.length; var ilen = item.length;
var tlen = txt.length; var tlen = txt.length;
@@ -271,13 +273,12 @@ frappe.search.AwesomeBar = Class.extend({
if (tlen > ilen) { if (tlen > ilen) {
return []; return [];
} }
if (item.indexOf(txt) !== -1) {
if (txt !== _txt && parsed_item.indexOf(_txt) !== -1) {
var regEx = new RegExp("("+ txt +")", "ig"); var regEx = new RegExp("("+ txt +")", "ig");
rendered_label = _item.replace(regEx, '<b>$1</b>'); rendered_label = _item.replace(regEx, '<b>$1</b>');
console.log("first", _txt, parsed_item);
return [_item, ilen/50, rendered_label]; return [_item, ilen/50, rendered_label];
} }
item = item.toLowerCase();
txt = txt.toLowerCase();
if (item.indexOf(txt) !== -1) { if (item.indexOf(txt) !== -1) {
var regEx = new RegExp("("+ txt +")", "ig"); var regEx = new RegExp("("+ txt +")", "ig");
rendered_label = _item.replace(regEx, '<b>$1</b>'); rendered_label = _item.replace(regEx, '<b>$1</b>');


+ 2
- 0
frappe/website/router.py View File

@@ -334,6 +334,8 @@ def sync_global_search():
from frappe.utils.global_search import sync_global_search from frappe.utils.global_search import sync_global_search
from bs4 import BeautifulSoup from bs4 import BeautifulSoup


if frappe.flags.update_global_search:
sync_global_search()
frappe.flags.update_global_search = [] frappe.flags.update_global_search = []
frappe.session.user = 'Guest' frappe.session.user = 'Guest'
frappe.local.no_cache = True frappe.local.no_cache = True


Loading…
Cancel
Save