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

[MERGE] merge trunk into local branch 

bzr revid: ged@openerp.com-20140130155402-h4y6k4ydk6s2yasv
This commit is contained in:
Gery Debongnie 2014-01-30 16:54:02 +01:00
parent 8ed584d1ac b0fa27dc7c
commit 1c42440313
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,6 +970,7 @@ openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, {
this.session_id = options.session_id || null;
this.override_session = options.override_session || !!options.session_id || false;
this.avoid_recursion = false;
this.use_cors = options.use_cors || false;
this.setup(origin);
},
setup: function(origin) {
@ -1013,7 +1014,7 @@ openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, {
},
check_session_id: function() {
var self = this;
if (this.avoid_recursion)
if (this.avoid_recursion || self.use_cors)
return $.when();
if (this.session_id)
return $.when(); // we already have the session id
@ -1070,6 +1071,15 @@ openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, {
"X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
});
}
} else if (self.use_cors) {
fct = openerp.jsonRpc;
url = self.url(url, null);
options.session_id = self.session_id || '';
if (self.override_session) {
options.headers = _.extend({}, options.headers, {
"X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
});
}
} else {
fct = openerp.jsonpRpc;
url = self.url(url, null);