diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-08-17 09:08:49 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-08-17 09:08:49 +0200 |
| commit | d22b14809be06393144f492aaef19fa27ef5fbe4 (patch) | |
| tree | feb3412c97ff05028406a7d90f17bdef0118b131 /addons/web_view_editor/static/src | |
| parent | 332b118e3e16ae764dface838af6451ad567c433 (diff) | |
| parent | 01b1e2209dbfc1d168fa56a53fb7225ac43925ad (diff) | |
[MERGE] trunk
bzr revid: fp@tinyerp.com-20120817070849-hii1q6yu8xpxz07o
Diffstat (limited to 'addons/web_view_editor/static/src')
| -rw-r--r-- | addons/web_view_editor/static/src/js/view_editor.js | 9 |
1 files changed, 4 insertions, 5 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 cfdd5d6bfea..e52a51d125e 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,11 +70,10 @@ 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.appendTo(self.view_edit_dialog.$element); - self.action_manager.renderElement(self.view_edit_dialog); + 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) { |