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

addons loading working 

bzr revid: al@openerp.com-20110316172042-go8m79n6j8b6lmaa
This commit is contained in:
Antony Lesuisse 2011-03-16 18:20:42 +01:00
parent 195d5aef8b
commit 02bf3106d6
3 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/base/controllers/main.py
View File

@ -41,8 +41,7 @@ class Xml2Json:
kids.append(Xml2Json.convert_element(kid))
if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
kids.append(kid.tail)
if len(kids):
res["children"] = kids
res["children"] = kids
return res
#----------------------------------------------------------

3
addons/base/static/openerp/js/boot.js
View File

@ -68,6 +68,7 @@
(function() {
if (this.openerp)
return;
var session_counter = 0;
// openerp instance constructor
var openerp = this.openerp = function() {
@ -79,7 +80,7 @@
_modules_loaded: false,
// this unique id will be replaced by hostname_databasename by
// openerp.base.Connection on the first connection
_session_id: "session" + openerp.sessions.length,
_session_id: "session" + session_counter++,
screen: openerp.screen,
sessions: openerp.sessions,
base: {}

69
addons/base/static/openerp/js/controllers.js
View File

@ -75,6 +75,7 @@ openerp.base.BasicController = Class.extend({
for (var name in this) {
if(typeof(this[name]) == "function") {
this[name].debug_name = name;
// bind ALL function to this not only on_and _do ?
if((/^on_|^do_/).test(name)) {
this[name] = openerp.base.callback(this, this[name]);
}
@ -135,6 +136,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
this.uid = false;
this.session_id = false;
this.module_list = [];
this.module_loaded = {"base": true};
this.context = {};
},
rpc: function(url, params, success_callback, error_callback) {
@ -222,40 +224,47 @@ openerp.base.Session = openerp.base.BasicController.extend({
session_load_modules: function() {
var self = this;
this.rpc('/base/session/modules', {}, function(result) {
this.module_list = result['modules'];
if(self.debug) {
self.log(self.module_list);
self.rpc('/base/session/jslist', {"mods": this.module_list.join(',')}, function(result) {
var files = result.files;
self.log(files);
// Insert addons javascript in head
for(var i=0; i<files.length; i++) {
// use $.getScript(‘your_3rd_party-script.js’); ? i want to keep lineno !
var s = document.createElement("script");
s.src = files[i];
s.type = "text/javascript";
document.getElementsByTagName("head")[0].appendChild(s);
// at this point the js should be loaded or not ?
}
for(var j=0; j<this.module_list.length; j++) {
var mod = this.module_list[j];
if(mod == "base")
continue;
self.log(mod);
self.log(openerp._openerp[mod]);
// init module mod
openerp._openerp[mod](openerp);
}
});
} else {
// load merged ones
// /base/session/css?mod=mod1,mod2,mod3
// /base/session/js?mod=mod1,mod2,mod3
}
self.module_list = result['modules'];
self.rpc('/base/session/jslist', {"mods": self.module_list.join(',')}, self.debug ? self.do_session_load_modules_debug : self.do_session_load_modules_prod);
openerp._modules_loaded = true;
});
this.uid = false;
},
do_session_load_modules_debug: function(result) {
var self = this;
var files = result.files;
// Insert addons javascript in head
for(var i=0; i<files.length; i++) {
var s = document.createElement("script");
s.src = files[i];
s.type = "text/javascript";
self.log("load script: " + s.src);
document.getElementsByTagName("head")[0].appendChild(s);
}
// at this point the js should be loaded or not ?
setTimeout(self.on_session_modules_loaded,100);
},
do_session_load_modules_prod: function() {
// load merged ones
// /base/session/css?mod=mod1,mod2,mod3
// /base/session/js?mod=mod1,mod2,mod3
// use $.getScript(‘your_3rd_party-script.js’); ? i want to keep lineno !
},
on_session_modules_loaded: function() {
var self = this;
self.log("init modules");
self.log(self.module_list);
for(var j=0; j<self.module_list.length; j++) {
var mod = self.module_list[j];
self.log("init module "+mod);
if(self.module_loaded[mod])
continue;
self.log(openerp._openerp[mod]);
openerp[mod] = {};
// init module mod
openerp._openerp[mod](openerp);
}
},
session_logout: function() {
this.uid = false;
}