summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-08-14 17:30:53 +0200
committerChristophe Simonis <chs@openerp.com>2012-08-14 17:30:53 +0200
commitc5dc5cef00cd596d6c0b6c9899bf1d8de16e9026 (patch)
treeafe2cd4879423f697986e52ba0011a2e2fbdda06 /addons
parent63e4d9b572f27a5cdfa347e159ebc7e39f240ce1 (diff)
[IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
Diffstat (limited to 'addons')
-rw-r--r--addons/auth_reset_password/static/src/js/reset_password.js2
-rw-r--r--addons/auth_signup/static/src/js/auth_signup.js4
-rw-r--r--addons/edi/static/src/js/edi.js6
-rw-r--r--addons/point_of_sale/static/src/js/pos_widgets.js2
-rw-r--r--addons/share/static/src/js/share.js12
-rw-r--r--addons/web_linkedin/static/src/js/linkedin.js2
6 files changed, 14 insertions, 14 deletions
diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js
index 41b48c7e59b..13cf070a548 100644
--- a/addons/auth_reset_password/static/src/js/reset_password.js
+++ b/addons/auth_reset_password/static/src/js/reset_password.js
@@ -31,7 +31,7 @@ openerp.auth_reset_password = function(instance) {
},
do_reset_password: function(db, email) {
var self = this;
- instance.connection.session_authenticate(db, 'anonymous', 'anonymous', true).pipe(function () {
+ instance.session.session_authenticate(db, 'anonymous', 'anonymous', true).pipe(function () {
var func = new instance.web.Model("res.users").get_func("send_reset_password_request");
return func(email).then(function(res) {
// show message
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 7384fe1e5f5..9dda111f044 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -12,7 +12,7 @@ openerp.auth_signup = function(instance) {
return false;
}
- var cnx = instance.connection;
+ var cnx = instance.session;
if (cnx.session_is_valid()) {
self._signup();
} else {
@@ -83,7 +83,7 @@ openerp.auth_signup = function(instance) {
type: 'ir.actions.client',
tag: 'login',
params: {
- db: instance.connection.db,
+ db: instance.session.db,
login: email,
password: password,
login_successful: function() {
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 24bf17a2f88..78e90852c38 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -6,7 +6,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
this._super();
this.db = db;
this.token = token;
- this.session = openerp.connection;
+ this.session = openerp.session;
this.template = "EdiEmpty";
this.content = "";
this.sidebar = "";
@@ -108,7 +108,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
});
openerp.edi.edi_view = function (db, token) {
- openerp.connection.session_bind().then(function () {
+ openerp.session.session_bind().then(function () {
new openerp.edi.EdiView(null,db,token).appendTo($("body").addClass('openerp'));
});
}
@@ -188,7 +188,7 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
});
openerp.edi.edi_import = function (url) {
- openerp.connection.session_bind().then(function () {
+ openerp.session.session_bind().then(function () {
new openerp.edi.EdiImport(null,url).appendTo($("body").addClass('openerp'));
});
}
diff --git a/addons/point_of_sale/static/src/js/pos_widgets.js b/addons/point_of_sale/static/src/js/pos_widgets.js
index bebbb3c1591..9a27be29381 100644
--- a/addons/point_of_sale/static/src/js/pos_widgets.js
+++ b/addons/point_of_sale/static/src/js/pos_widgets.js
@@ -674,7 +674,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
self.$('.loader img').hide();
return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
.pipe( _.bind(function(res){
- return instance.connection.rpc('/web/action/load', {'action_id': res[0]['res_id']})
+ return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']})
.pipe(_.bind(function(result){
var action = result.result;
this.do_action(action);
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 33aa3d1aab9..6cc12a5bfa8 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -35,19 +35,19 @@ openerp.share = function(session) {
}
function has_share(yes, no) {
- if (!session.connection.share_flag) {
- session.connection.share_flag = $.Deferred(function() {
+ if (!session.session.share_flag) {
+ session.session.share_flag = $.Deferred(function() {
var func = new session.web.Model("share.wizard").get_func("has_share");
- func(session.connection.uid).pipe(function(res) {
+ func(session.session.uid).pipe(function(res) {
if(res) {
- session.connection.share_flag.resolve();
+ session.session.share_flag.resolve();
} else {
- session.connection.share_flag.reject();
+ session.session.share_flag.reject();
}
});
});
}
- session.connection.share_flag.done(yes).fail(no);
+ session.session.share_flag.done(yes).fail(no);
}
/* Extend the Sidebar to add Share and Embed links in the 'More' menu */
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 977e7a60cbb..c15b995bff9 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -78,7 +78,7 @@ openerp.web_linkedin = function(instance) {
}, _.bind(this.linkedin_disabled, this));
},
linkedin_disabled: function() {
- if (instance.connection.uid !== 1) {
+ if (instance.session.uid !== 1) {
instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
title: _t("LinkedIn is not enabled"),
buttons: [