diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js index 3657807f48..e2ac9f7963 100644 --- a/frappe/public/js/frappe/ui/page.js +++ b/frappe/public/js/frappe/ui/page.js @@ -593,7 +593,7 @@ frappe.ui.Page = class Page { return $('
').appendTo(this.menu); } - get_or_add_inner_group_button(label) { + get_or_add_inner_group_button(label, align_right) { var $group = this.inner_toolbar.find( `.inner-group-button[data-label="${encodeURIComponent(label)}"]` ); @@ -604,7 +604,7 @@ frappe.ui.Page = class Page { ${label} ${frappe.utils.icon("select", "xs")} - + ` ).appendTo(this.inner_toolbar); } @@ -650,7 +650,7 @@ frappe.ui.Page = class Page { * @param {object} action - function to be called when button is clicked * @param {string} group - Label of the group button */ - add_inner_button(label, action, group, type = "default") { + add_inner_button(label, action, group, type = "default", align_right = false) { var me = this; let _action = function () { let btn = $(this); @@ -667,7 +667,7 @@ frappe.ui.Page = class Page { } if (group) { - var $group = this.get_or_add_inner_group_button(group); + var $group = this.get_or_add_inner_group_button(group, align_right); $(this.inner_toolbar).removeClass("hide"); if (!this.is_in_group_button_dropdown($group.find(".dropdown-menu"), "a", label)) { diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 47d25a8c26..84286caccb 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -61,7 +61,6 @@ frappe.views.TreeView = class TreeView { this.make_page(); this.make_filters(); this.root_value = null; - if (me.opts.get_tree_root) { this.get_root(); } @@ -113,7 +112,9 @@ frappe.views.TreeView = class TreeView { function () { me.rebuild_tree(); }, - __("Expand") + __("Expand"), + "default", + true ); } @@ -123,7 +124,9 @@ frappe.views.TreeView = class TreeView { function () { me.tree.load_children(me.tree.root_node, false); }, - __("Expand") + __("Expand"), + "default", + true ); this.page.add_inner_button( @@ -131,7 +134,9 @@ frappe.views.TreeView = class TreeView { function () { me.tree.load_children(me.tree.root_node, true); }, - __("Expand") + __("Expand"), + "default", + true ); } @@ -186,7 +191,6 @@ frappe.views.TreeView = class TreeView { } get_root() { var me = this; - frappe.call({ method: me.get_tree_nodes, args: me.args,