diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-08-21 17:31:22 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-08-21 17:31:22 +0530 |
| commit | 05bf985ace55c49b67251a0569a4754e98eb1a7a (patch) | |
| tree | 485d9e235ed0bd70301263f548e1cc5971232c2d /addons/web_view_editor/static/src/js | |
| parent | 63702d6064d6dd457ccd82aa56ac44d375fe001c (diff) | |
| parent | 6647c92bb78e5c50227da2d427db5268ea62f2d9 (diff) | |
[merge]trunk.
bzr revid: vme@tinyerp.com-20120821120122-7lgndirsyuaop6mi
Diffstat (limited to 'addons/web_view_editor/static/src/js')
| -rw-r--r-- | addons/web_view_editor/static/src/js/view_editor.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 770d32b2e56..6d1ffd8aaa8 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -19,7 +19,7 @@ instance.web.ViewManagerAction.include({ } } }) -instance.web_view_editor.ViewEditor = instance.web.OldWidget.extend({ +instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id; @@ -70,10 +70,11 @@ instance.web_view_editor.ViewEditor = instance.web.OldWidget.extend({ this.view_edit_dialog.on_close.add_last(function(){window.location.reload();}); this.main_view_id = this.parent.fields_view.view_id; this.action_manager = new instance.web.ActionManager(this); + this.action_manager.appendTo(this.view_edit_dialog.$element); $.when(this.action_manager.do_action(action)).then(function() { - var viewmanager = self.action_manager.inner_widget, - controller = viewmanager.views[viewmanager.active_view].controller; - self.action_manager.$element.appendTo(self.view_edit_dialog.$element); + + var viewmanager = self.action_manager.inner_widget; + var controller = viewmanager.views[viewmanager.active_view].controller; controller.on_loaded.add_last(function(){ $(controller.groups).bind({ 'selected': function(e, ids, records) { |