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

Merge pull request #36645 from sokumon/desktop-ui-issues

Browse source
This commit is contained in:
Soham Kulkarni 2026-02-03 18:09:16 +05:30 • committed by GitHub
commit 344aa4ed14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/desk/doctype/desktop_layout/desktop_layout.py
View file

@ -48,3 +48,8 @@ def save_layout(user, layout, new_icons):
desktop_icon.save()
return {"layout": layout}
@frappe.whitelist()
def delete_layout():
return frappe.delete_doc_if_exists("Desktop Layout", frappe.session.user)

14
frappe/desk/page/desktop/desktop.js
View file

@ -129,8 +129,11 @@ function save_desktop(icons) {
}
function reset_to_default() {
frappe.db.delete_doc("Desktop Layout", frappe.session.user).then(() => {
frappe.ui.toolbar.clear_cache();
frappe.call({
method: "frappe.desk.doctype.desktop_layout.desktop_layout.delete_layout",
callback: function (r) {
frappe.ui.toolbar.clear_cache();
},
});
}
@ -454,6 +457,8 @@ class DesktopPage {
});
}
add_menu_item(item) {
if (this.desktop_menu_items && this.desktop_menu_items.find((i) => i.label === item.label))
return;
this.desktop_menu_items.push(item);
}
setup_navbar() {
@ -490,9 +495,10 @@ class DesktopPage {
handle_route_change() {
const me = this;
frappe.router.on("change", function () {
if (frappe.get_route()[0] == "desktop" || frappe.get_route()[0] == "")
if (frappe.get_route()[0] == "desktop" || frappe.get_route()[0] == "") {
me.setup_navbar();
else {
me.setup_edit_button();
} else {
$(".navbar").show();
frappe.desktop_utils.close_desktop_modal();
// stop edit mode if route changes and cleanup