diff options
| author | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
|---|---|---|
| committer | Vidhin Mehta <vme@tinyerp.com> | 2013-08-23 10:36:02 +0530 |
| commit | 75ddd5ccbec73c4a671b6a74efaa3d41dc2ea2db (patch) | |
| tree | 50ed3620df15e8533760f5d47e754a1d39c1e856 /addons/board | |
| parent | 42f27a15275effd9c43dfe99e32c395ca6b3fd8a (diff) | |
| parent | a7f4b6aaa0359d12046e81183417c24f093cd7c3 (diff) | |
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
Diffstat (limited to 'addons/board')
| -rw-r--r-- | addons/board/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/board/static/src/js/dashboard.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py index e699e091176..87771b2f518 100644 --- a/addons/board/__openerp__.py +++ b/addons/board/__openerp__.py @@ -31,7 +31,7 @@ Lets the user create a custom dashboard. Allows users to create custom dashboard. """, 'author': 'OpenERP SA', - 'depends': ['base'], + 'depends': ['base', 'web'], 'data': [ 'security/ir.model.access.csv', 'board_view.xml', diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 3489b686e1b..65737ad234e 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -344,7 +344,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({ }, load_data:function(){ var board = new instance.web.Model('board.board'); - return board.call('list'); + return board.call('list', [board.context()]); }, _x:function() { if (!instance.webclient) { return $.Deferred().reject(); } @@ -381,6 +381,10 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({ _.each(data.contexts, context.add, context); _.each(data.domains, domain.add, domain); + context.add({ + group_by: instance.web.pyeval.eval('groupbys', data.groupbys || []) + }); + var c = instance.web.pyeval.eval('context', context); for(var k in c) { if (c.hasOwnProperty(k) && /^search_default_/.test(k)) { |