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

Merge pull request #35852 from sokumon/sidebar-fixes

Browse source
This commit is contained in:
Soham Kulkarni 2026-01-12 15:41:54 +05:30 • committed by GitHub
commit b71edf97ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/ui/menu.js
View file

@ -21,7 +21,7 @@ frappe.ui.menu = class ContextMenu {
event.stopPropagation();
if (me.visible) {
me.hide();
me.opts.onHide && me.opts.onHide(me);
me.opts.onHide && me.opts.onHide(me.parent);
} else {
me.show(event);
me.opts.onShow && me.opts.onShow(me.parent);

18
frappe/public/js/frappe/ui/sidebar/sidebar_item.js
View file

@ -19,12 +19,15 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem {
type: this.item.link_type,
name: this.item.link_to,
};
if (this.item.report || !frappe.app.sidebar.editor.edit_mode) {
args.is_query_report =
this.item.report.report_type === "Query Report" ||
this.item.report.report_type == "Script Report";
args.report_ref_doctype = this.item.report.ref_doctype;
if (!frappe.app.sidebar.editor.edit_mode) {
if (this.item.report) {
args.is_query_report =
this.item.report.report_type === "Query Report" ||
this.item.report.report_type == "Script Report";
args.report_ref_doctype = this.item.report.ref_doctype;
} else {
return;
}
}
path = frappe.utils.generate_route(args);
@ -72,6 +75,9 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem {
prepare() {}
make() {
this.path = this.get_path();
if (!this.path && !this.item.standard && this.item.type != "Section Break") {
return;
}
this.set_suffix();
if (!this.item.icon && !(this.item.child && this.item.parent.indent)) {
this.item.icon = "list";