From 89487eb2a278c63a478782deb5c1a6dd88db4262 Mon Sep 17 00:00:00 2001
From: Phi-Long Do
Date: Fri, 22 Jan 2021 11:13:06 +0100
Subject: [PATCH] Fix parent toolbar/menubar displayed in dashlet
Parent toolbar/menubar were displayed in dashlets in these cases:
- tree view (toolbar and menubar)
- grid view (menubar)
Fixes RM-33736
---
axelor-web/src/main/webapp/js/view/view.dashboard.js | 2 ++
.../unreleased/fix-parent-toolbar-menubar-in-dashlet.yml | 3 +++
2 files changed, 5 insertions(+)
create mode 100644 changelogs/unreleased/fix-parent-toolbar-menubar-in-dashlet.yml
diff --git a/axelor-web/src/main/webapp/js/view/view.dashboard.js b/axelor-web/src/main/webapp/js/view/view.dashboard.js
index 7e8160decc..c4d3798f9f 100644
--- a/axelor-web/src/main/webapp/js/view/view.dashboard.js
+++ b/axelor-web/src/main/webapp/js/view/view.dashboard.js
@@ -141,6 +141,8 @@ function DashletCtrl($scope, $element, MenuService, DataSource, ViewService) {
var self = this;
var init = _.once(function init() {
+ $scope.toolbar = null;
+ $scope.menubar = null;
ui.ViewCtrl.call(self, $scope, DataSource, ViewService);
diff --git a/changelogs/unreleased/fix-parent-toolbar-menubar-in-dashlet.yml b/changelogs/unreleased/fix-parent-toolbar-menubar-in-dashlet.yml
new file mode 100644
index 0000000000..ba671150de
--- /dev/null
+++ b/changelogs/unreleased/fix-parent-toolbar-menubar-in-dashlet.yml
@@ -0,0 +1,3 @@
+---
+title: Fix parent toolbar/menubar displayed in dashlet
+type: fix