diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-06-28 12:01:10 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-06-28 12:01:10 +0200 |
| commit | c2c64560c7d555b41d9db5aaf375d5de1e24fc58 (patch) | |
| tree | 9374895dc625a4bbfa61c9a14b8e57e00e748b44 /addons/base/static/src | |
| parent | d106b1479d1d4aaa0179a85d519880d03dfc2fc7 (diff) | |
[FIX] Merge action context to dataset context from ViewManagerAction
bzr revid: fme@openerp.com-20110628100110-dy9p1r2gibuhk5ws
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/js/views.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index b59d9f20883..fe92a114add 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -242,13 +242,14 @@ openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.b openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ init: function(session, element_id, action) { var dataset; - if(!action.res_id) { - dataset = new openerp.base.DataSetSearch(session, action.res_model); + if (!action.res_id) { + dataset = new openerp.base.DataSetSearch(session, action.res_model, action.context || null); } else { - dataset = new openerp.base.DataSetStatic(session, action.res_model); - dataset.ids = [action.res_id]; - dataset.count = 1; - dataset.index = 0; + dataset = new openerp.base.DataSetStatic(session, action.res_model, [action.res_id]); + if (action.context) { + // TODO fme: should normalize all DataSets constructors to (session, model, context, ...) + dataset.context = action.context; + } } this._super(session, element_id, dataset, action.views); this.action = action; @@ -423,7 +424,7 @@ openerp.base.View = openerp.base.Controller.extend({ active_id: dataset.ids[dataset.index], active_ids: [dataset.ids[dataset.index]], active_model: dataset.model - }, dataset.context); + }); action.flags = { sidebar : false, search_view : false, |