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

[WIP] Renamed dialog_viewmanager to dialog_widget 

bzr revid: fme@openerp.com-20120711130525-qpmsh7qtmtbl65xw
This commit is contained in:
Fabien Meghazi 2012-07-11 15:05:25 +02:00
parent 1144a72e14
commit 7564a0c1b1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/view_editor.js
View File

@ -998,7 +998,7 @@ instance.web.ViewEditor = instance.web.OldWidget.extend({
};
var action_manager = new instance.web.ActionManager(self);
$.when(action_manager.do_action(action)).then(function() {
var controller = action_manager.dialog_viewmanager.views['form'].controller;
var controller = action_manager.dialog_widget.views['form'].controller;
controller.on_button_cancel.add_last(function(){
action_manager.destroy()
});

12
addons/web/static/src/js/views.js
View File

@ -13,7 +13,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.inner_action = null;
this.inner_widget = null;
this.dialog = null;
this.dialog_viewmanager = null;
this.dialog_widget = null;
},
start: function() {
this._super.apply(this, arguments);
@ -21,8 +21,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
},
dialog_stop: function () {
if (this.dialog) {
this.dialog_viewmanager.destroy();
this.dialog_viewmanager = null;
this.dialog_widget.destroy();
this.dialog_widget = null;
this.dialog.destroy();
this.dialog = null;
}
@ -135,11 +135,11 @@ instance.web.ActionManager = instance.web.Widget.extend({
if(on_close)
this.dialog.on_close.add(on_close);
} else {
this.dialog_viewmanager.destroy();
this.dialog_widget.destroy();
}
this.dialog.dialog_title = action.name;
this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action);
this.dialog_viewmanager.appendTo(this.dialog.$element);
this.dialog_widget = new instance.web.ViewManagerAction(this.dialog, action);
this.dialog_widget.appendTo(this.dialog.$element);
this.dialog.open();
} else {
this.dialog_stop();