odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed conflicts in kanban.js. Thanks to VME. 

bzr revid: vta@openerp.com-20121010125212-oy5m304knbifad52
This commit is contained in:
vta vta@openerp.com 2012-10-10 14:52:12 +02:00
parent afd1a80620
commit 6ef264339c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web_kanban/static/src/js/kanban.js
View File

@ -672,13 +672,8 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
});
var am = instance.webclient.action_manager;
var form = am.dialog_widget.views.form.controller;
<<<<<<< TREE
form.on("on_button_cancel", self, am.dialog.on_close);
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();
self.view.do_reload();
});