[FIX] Fixed conflicts in kanban.js. Thanks to VME.
bzr revid: vta@openerp.com-20121010125212-oy5m304knbifad52
This commit is contained in:
parent
afd1a80620
commit
6ef264339c
|
@ -672,13 +672,8 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
|
||||||
});
|
});
|
||||||
var am = instance.webclient.action_manager;
|
var am = instance.webclient.action_manager;
|
||||||
var form = am.dialog_widget.views.form.controller;
|
var form = am.dialog_widget.views.form.controller;
|
||||||
<<<<<<< TREE
|
|
||||||
form.on("on_button_cancel", self, am.dialog.on_close);
|
form.on("on_button_cancel", self, am.dialog.on_close);
|
||||||
form.on_saved.add_last(function() {
|
form.on_saved.add_last(function() {
|
||||||
=======
|
|
||||||
form.on_button_cancel.add_last(am.dialog.on_close);
|
|
||||||
form.on('on_saved', self, function() {
|
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
am.dialog.on_close();
|
am.dialog.on_close();
|
||||||
self.view.do_reload();
|
self.view.do_reload();
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue