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

[IMP] session_bind to stay consistent with session_* 

bzr revid: al@openerp.com-20120402142251-flk6xr0iwbddox00
This commit is contained in:
Antony Lesuisse 2012-04-02 16:22:51 +02:00
parent d2e213844a
commit c6107de0ba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/chrome.js
View File

@ -989,7 +989,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
self.$element.toggleClass('clark-gable');
});
}
this.session.bind_session().then(function() {
this.session.session_bind().then(function() {
if (!self.session.session_is_valid()) {
self.show_login();
}
@ -1166,7 +1166,7 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
var sc = document.getElementsByTagName('script');
currentScript = sc[sc.length-1];
}
openerp.connection.bind_session(origin).then(function () {
openerp.connection.session_bind(origin).then(function () {
openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
var client = new openerp.web.EmbeddedClient(action, options);
client.insertAfter(currentScript);

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

@ -383,7 +383,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
this.name = openerp._session_id;
this.qweb_mutex = new $.Mutex();
},
bind_session: function(origin) {
session_bind: function(origin) {
var window_origin = location.protocol+"//"+location.host, self=this;
this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
this.prefix = this.origin;