From afd44ea349653b84375f523b84ded06849f8ea3b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 13:42:07 +0530 Subject: [PATCH] fix: sider fix --- frappe/desk/desktop.py | 3 ++- frappe/desk/doctype/internal_wiki/internal_wiki.py | 1 - frappe/public/js/frappe/views/wiki.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 1789f04924..042093d412 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -581,7 +581,8 @@ def save_new_widget(page, blocks, new_widgets): page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - if widgets: clean_up(page_doc, blocks) + if widgets: + clean_up(page_doc, blocks) # Set label page_doc.label = page + '-Wiki-' + frappe.session.user diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index e4d08443d3..de7482e434 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -from frappe import _ import json from frappe.desk.desktop import save_new_widget from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 29a5ea792a..5a41cf0968 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -341,7 +341,7 @@ frappe.views.Wiki = class Wiki { indicator: 'info' }, 5); }); - } else{ + } else { frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, @@ -415,9 +415,11 @@ frappe.views.Wiki = class Wiki { } initialize_new_page() { - let parent_pages = this.all_pages.filter(page => !page.parent_page && page.parent_wiki != "Default").map(page => page.title) + let parent_pages = this.all_pages + .filter(page => !page.parent_page && page.parent_wiki != "Default") + .map(page => page.title); if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title) + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); } const d = new frappe.ui.Dialog({ title: __('Set Title'), @@ -549,7 +551,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', - public: me.public || false, + public: me.public || null, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets,