diff options
| author | RomainLibert <rli@odoo.com> | 2019-08-07 12:51:03 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-10-18 12:37:52 +0000 |
| commit | 69319bba3e9ba20d14f6b30bd555f6d2d7478f0a (patch) | |
| tree | 311c8572d0ab8ea6f4278321ac455ca5dc8b908c /addons/lunch/static | |
| parent | ace7f03bab4bdb5c56e027b810141d20e5b08430 (diff) | |
[IMP] lunch: get rid of the lunch_order_temp wizard
Replace lunch.order.temp wizard by lunch.order (fp request)
closes odoo/odoo#35585
Taskid: 2048667
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/lunch/static')
| -rw-r--r-- | addons/lunch/static/src/js/lunch_kanban_controller.js | 22 | ||||
| -rw-r--r-- | addons/lunch/static/tests/lunch_kanban_tests.js | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/addons/lunch/static/src/js/lunch_kanban_controller.js b/addons/lunch/static/src/js/lunch_kanban_controller.js index 5a9de5ac8db..7713c192bb3 100644 --- a/addons/lunch/static/src/js/lunch_kanban_controller.js +++ b/addons/lunch/static/src/js/lunch_kanban_controller.js @@ -174,14 +174,26 @@ var LunchKanbanController = KanbanController.extend({ }, }; - this.do_action({ - res_model: 'lunch.order.temp', - name: 'Configure Your Order', + // YTI TODO Maybe don't always pass the default_product_id + var action = { + res_model: 'lunch.order', + name: _t('Configure Your Order'), type: 'ir.actions.act_window', views: [[false, 'form']], target: 'new', - context: _.extend(ctx, {default_product_id: ev.data.productId, line_id: ev.data.lineId || false}), - }, options); + context: _.extend(ctx, {default_product_id: ev.data.productId}), + }; + + if (ev.data.lineId) { + action = _.extend(action, { + res_id: ev.data.lineId, + context: _.extend(action.context, { + active_id: ev.data.lineId, + }), + }); + } + + this.do_action(action, options); }, _onOrderNow: function (ev) { var self = this; diff --git a/addons/lunch/static/tests/lunch_kanban_tests.js b/addons/lunch/static/tests/lunch_kanban_tests.js index b16dee08915..6dfb524ef9e 100644 --- a/addons/lunch/static/tests/lunch_kanban_tests.js +++ b/addons/lunch/static/tests/lunch_kanban_tests.js @@ -691,13 +691,12 @@ QUnit.module('LunchKanbanView', { do_action: function (ev) { assert.deepEqual(ev.data.action, { name: "Configure Your Order", - res_model: 'lunch.order.temp', + res_model: 'lunch.order', type: 'ir.actions.act_window', views: [[false, 'form']], target: 'new', context: { default_product_id: 1, - line_id: false, }, }, "should open the wizard"); |