From c1b4ad7c6d7044de41af8cf106374c86e1b97eef Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 19 Jun 2020 07:06:34 +0000 Subject: [PATCH] [IMP] purchase: enable sample data in dashboard For the sample data feature to work, rpcs done by the view need to be mocked. This commit properly mocks the 'retrieve_dashboard' function. It also remove custom no content helper style that was conflicting with the new style in web. Task 2232801 X-original-commit: 300bc6d9ac2c1bea823bfc80675ffcf8e5dd3e9f --- .../purchase/static/src/js/purchase_dashboard.js | 15 +++++++++++++-- addons/purchase/static/src/scss/purchase.scss | 6 ------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/addons/purchase/static/src/js/purchase_dashboard.js b/addons/purchase/static/src/js/purchase_dashboard.js index 70075389f9b..7eb0a3aacd3 100644 --- a/addons/purchase/static/src/js/purchase_dashboard.js +++ b/addons/purchase/static/src/js/purchase_dashboard.js @@ -18,10 +18,21 @@ var KanbanController = require('web.KanbanController'); var KanbanModel = require('web.KanbanModel'); var KanbanRenderer = require('web.KanbanRenderer'); var KanbanView = require('web.KanbanView'); +var SampleServer = require('web.SampleServer'); var view_registry = require('web.view_registry'); var QWeb = core.qweb; +// Add mock of method 'retrieve_dashboard' in SampleServer, so that we can have +// the sample data in empty purchase kanban and list view +let dashboardValues; +SampleServer.mockRegistry.add('purchase.order', { + retrieve_dashboard: () => { + return Object.assign({}, dashboardValues); + }, +}); + + //-------------------------------------------------------------------------- // List View //-------------------------------------------------------------------------- @@ -107,7 +118,7 @@ var PurchaseListDashboardModel = ListModel.extend({ }); return Promise.all([super_def, dashboard_def]).then(function(results) { var id = results[0]; - var dashboardValues = results[1]; + dashboardValues = results[1]; self.dashboardValues[id] = dashboardValues; return id; }); @@ -222,7 +233,7 @@ var PurchaseKanbanDashboardModel = KanbanModel.extend({ }); return Promise.all([super_def, dashboard_def]).then(function(results) { var id = results[0]; - var dashboardValues = results[1]; + dashboardValues = results[1]; self.dashboardValues[id] = dashboardValues; return id; }); diff --git a/addons/purchase/static/src/scss/purchase.scss b/addons/purchase/static/src/scss/purchase.scss index 003bb0a488e..1c6644c4667 100644 --- a/addons/purchase/static/src/scss/purchase.scss +++ b/addons/purchase/static/src/scss/purchase.scss @@ -52,9 +52,3 @@ } } } - -.o_purchase_dashboard ~ .o_view_nocontent { - // To prevent overlapping from inherited values - position: relative; - width: 100%; -}