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 · Jan 25, 2021 · 89487eb · 89487eb
1 parent d49b35d
commit 89487eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -0,0 +1,3 @@
+---
+title: Fix parent toolbar/menubar displayed in dashlet
+type: fix