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

[fix] awesomebar new option with/without new keyword

Browse source
This commit is contained in:
pratu16x7 2017-02-27 12:22:38 +05:30
parent b373753c6a
commit aee1ab9cf9
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,6 @@ frappe.search.AwesomeBar = Class.extend({
}
if(item.onclick) {
// frappe.new_doc(item.match, true);
item.onclick(item.match);
} else {
var previous_hash = window.location.hash;
@ -463,16 +462,18 @@ frappe.search.AwesomeBar = Class.extend({
rendered_label = result[2];
if(target) {
// include 'making new' option
// if(in_list(frappe.boot.user.can_create, target)) {
// out.push({
// label: rendered_label,
// value: __("New {0}", [target]),
// index: index,
// type: "New",
// prefix: "New",
// onclick: function() { frappe.new_doc(target, true); }
// });
// }
if(in_list(frappe.boot.user.can_create, target)) {
var match = target;
out.push({
label: rendered_label,
value: __("New {0}", [target]),
index: 15 + index + 0.004,
type: "New",
prefix: "New",
match: target,
onclick: function() { frappe.new_doc(match, true); }
});
}
if(in_list(frappe.boot.single_types, target)) {
out.push(option("", ["Form", target, target], 0));

2
frappe/public/js/frappe/ui/toolbar/search.js
View file

@ -648,7 +648,7 @@ frappe.search.NavSearch = frappe.search.GlobalSearch.extend({
'><a class="text-muted" href="{0}">{1}</a></button>';
var button = $(__(button_html, [me.make_path(s.route), s.type]));
result_div.append(button);
} else {
} else if (s.type !== "New") {
title_link_html = '<a href="{0}" class="module-section-link small result-main">{1}</a>';
if(s.type === "List") {
var link = $(__(title_link_html, [me.make_path(s.route), result.title]));