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

more nivification of ViewManager 

bzr revid: al@openerp.com-20110810015211-mwyex6w9pze8djk2
This commit is contained in:
Antony Lesuisse 2011-08-10 03:52:11 +02:00
parent 8b0443e1a5
commit c1191b54ef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base/static/src/js/form.js
View File

@ -1648,7 +1648,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
});
this.views = views;
this.viewmanager = new openerp.base.ViewManager(this, this.element_id, this.dataset, views);
this.viewmanager = new openerp.base.ViewManager(this, this.dataset, views);
this.viewmanager.registry = openerp.base.views.clone({
list: 'openerp.base.form.One2ManyListView',
form: 'openerp.base.form.One2ManyFormView'
@ -1674,7 +1674,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
self.save_form_view();
});
setTimeout(function () {
self.viewmanager.start();
self.viewmanager.appendTo(this.$element);
}, 0);
},
reload_current_view: function() {

2
addons/base/static/src/js/views.js
View File

@ -77,7 +77,6 @@ openerp.base.ActionManager = openerp.base.Widget.extend({
ir_actions_act_window: function (action, on_closed) {
if (action.flags.popup) {
if (this.dialog == null) {
debugger;
this.dialog = new openerp.base.ActionDialog(this, { title: action.name, width: '80%' });
this.dialog.close_callback = on_closed;
this.dialog.start(false);
@ -300,6 +299,7 @@ openerp.base.NullViewManager = openerp.base.generate_null_object_class(openerp.b
}
});
// Move parts or everything to ActionManager
openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
init: function(parent, action) {
this.session = parent.session;

6
addons/base_dashboard/static/src/js/dashboard.js
View File

@ -228,9 +228,9 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
action_buttons : false,
pager: false
};
new openerp.base.ActionManager(
this, this.view.element_id + '_action_' + action.id)
.do_action(action);
var am = new openerp.base.ActionManager(this);
am.appendTo($("#"+this.view.element_id + '_action_' + action.id));
am.do_action(action);
},
render: function() {
// We should start with three columns available