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

First part of modifications to use anonymous mode customer-side 

bzr revid: nicolas.vanhoren@openerp.com-20130201161622-ey7rdqtmw3203lde
This commit is contained in:
niv-openerp 2013-02-01 17:16:22 +01:00
parent cb60a43ffd
commit 654350c2d5
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/live_support/static/ext/static/js/livesupport.js
View File

@ -25,7 +25,7 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
$.when(templates_def, css_def).then(function() {
console.log("starting client");
connection = new oeclient.Connection(new oeclient.JsonpRPCConnector(server_url), db, login, password);
connection.getModel("res.users").search_read([["login", "=", ["demo"]]]).then(function(result) {
connection.getModel("im.user").search_read([["name", "=", ["Demo User"]]]).then(function(result) {
demo_id = result[0].id;
var manager = new livesupport.ConversationManager(null);
manager.start_polling().then(function() {
@ -43,7 +43,8 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
__include__: [nova.DynamicProperties],
__init__: function(parent, user_rec) {
nova.DynamicProperties.__init__.call(this, parent);
//user_rec.image_url = instance.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.id});
//if (user_rec.user)
// user_rec.image_url = instance.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.user[0]});
this.set(user_rec);
this.set("watcher_count", 0);
this.on("change:watcher_count", this, function() {
@ -92,15 +93,22 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
},
start_polling: function() {
var self = this;
return this.ensure_users([connection.userId]).then(function() {
var me = self.users_cache[connection.userId];
delete self.users_cache[connection.userId];
self.me = me;
connection.connector.call("/longpolling/im/activated", {}).then(function(activated) {
if (activated) {
self.activated = true;
self.poll();
}
return connection.connector.call("/longpolling/im/gen_uuid", {}).then(function(uuid) {
self.my_uuid = uuid;
return connection.getModel("im.user").call("get_by_user_id", [uuid]).then(function(my_id) {
self.my_id = my_id;
return self.ensure_users([self.my_id]).then(function() {
var me = self.users_cache[self.my_id];
delete self.users_cache[self.my_id];
self.me = me;
connection.connector.call("/longpolling/im/activated", {}).then(function(activated) {
if (activated) {
self.activated = true;
self.poll();
}
});
});
});
});
},
@ -114,7 +122,7 @@ define(["nova", "jquery", "underscore", "oeclient", "require"], function(nova, $
if (_.size(no_cache) === 0)
return $.when();
else
return connection.getModel("im.user").call("read_users", [_.values(no_cache), ["name"]]).then(function(users) {
return connection.getModel("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
self.add_to_user_cache(users);
});
},

2
addons/live_support/static/ext/test.html
View File

@ -15,7 +15,7 @@
},
})(["livesupport", "jquery"], function(livesupport, jQuery) {
jQuery.noConflict();
livesupport.main("http://localhost:8069", "im", "admin", "a");
livesupport.main("http://localhost:8069", "test", "admin", "a");
});
</script>
</head>

2
addons/web_im/static/src/js/im.js
View File

@ -210,7 +210,7 @@ openerp.web_im = function(instance) {
},
start_polling: function() {
var self = this;
new instance.web.Model("im.user").call("get_by_user_id", [instance.session.uid]).then(function(my_id) {
return new instance.web.Model("im.user").call("get_by_user_id", [instance.session.uid]).then(function(my_id) {
self.my_id = my_id["id"];
return self.ensure_users([self.my_id]).then(function() {
var me = self.users_cache[self.my_id];