Added possibility to customize user name
bzr revid: nicolas.vanhoren@openerp.com-20130212155756-6b0x7myjnszrkuc1
This commit is contained in:
parent
7835ec8b4e
commit
bf20a4ae58
|
@ -40,6 +40,7 @@ class ImportController(openerp.addons.web.http.Controller):
|
||||||
p = json.loads(kwargs["p"])
|
p = json.loads(kwargs["p"])
|
||||||
db = p["db"]
|
db = p["db"]
|
||||||
channel = p["channel"]
|
channel = p["channel"]
|
||||||
|
user_name = p.get("user_name", None)
|
||||||
req.session._db = db
|
req.session._db = db
|
||||||
req.session._uid = None
|
req.session._uid = None
|
||||||
req.session._login = "anonymous"
|
req.session._login = "anonymous"
|
||||||
|
@ -47,6 +48,7 @@ class ImportController(openerp.addons.web.http.Controller):
|
||||||
info = req.session.model('live_support.channel').get_info_for_chat_src(channel)
|
info = req.session.model('live_support.channel').get_info_for_chat_src(channel)
|
||||||
info["db"] = db
|
info["db"] = db
|
||||||
info["channel"] = channel
|
info["channel"] = channel
|
||||||
|
info["userName"] = user_name
|
||||||
return req.make_response(env.get_template("loader.js").render(info),
|
return req.make_response(env.get_template("loader.js").render(info),
|
||||||
headers=[('Content-Type', "text/javascript")])
|
headers=[('Content-Type', "text/javascript")])
|
||||||
|
|
||||||
|
|
|
@ -19,5 +19,6 @@ require.config({
|
||||||
inputPlaceholder: {{inputPlaceholder | json}},
|
inputPlaceholder: {{inputPlaceholder | json}},
|
||||||
defaultMessage: {{(defaultMessage or None) | json}},
|
defaultMessage: {{(defaultMessage or None) | json}},
|
||||||
auto: window.oe_live_support_auto || false,
|
auto: window.oe_live_support_auto || false,
|
||||||
|
userName: {{userName | json}} || undefined,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -8,6 +8,7 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
|
||||||
var connection;
|
var connection;
|
||||||
|
|
||||||
var defaultInputPlaceholder;
|
var defaultInputPlaceholder;
|
||||||
|
var userName;
|
||||||
|
|
||||||
livesupport.main = function(server_url, db, login, password, channel, options) {
|
livesupport.main = function(server_url, db, login, password, channel, options) {
|
||||||
var defs = [];
|
var defs = [];
|
||||||
|
@ -17,8 +18,10 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
|
||||||
inputPlaceholder: "How may I help you?",
|
inputPlaceholder: "How may I help you?",
|
||||||
defaultMessage: null,
|
defaultMessage: null,
|
||||||
auto: false,
|
auto: false,
|
||||||
|
userName: "Anonymous",
|
||||||
});
|
});
|
||||||
defaultInputPlaceholder = options.inputPlaceholder;
|
defaultInputPlaceholder = options.inputPlaceholder;
|
||||||
|
userName = options.userName;
|
||||||
defs.push($.ajax({
|
defs.push($.ajax({
|
||||||
url: require.toUrl("./livesupport_templates.js"),
|
url: require.toUrl("./livesupport_templates.js"),
|
||||||
jsonp: false,
|
jsonp: false,
|
||||||
|
@ -177,21 +180,24 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
|
||||||
}
|
}
|
||||||
return def.then(function(uuid) {
|
return def.then(function(uuid) {
|
||||||
localStorage["oe_livesupport_uuid"] = uuid;
|
localStorage["oe_livesupport_uuid"] = uuid;
|
||||||
return connection.getModel("im.user").call("get_by_user_id", [uuid]).then(function(my_id) {
|
return connection.getModel("im.user").call("get_by_user_id", [uuid]);
|
||||||
self.my_id = my_id["id"];
|
}).then(function(my_id) {
|
||||||
return self.ensure_users([self.my_id]).then(function() {
|
self.my_id = my_id["id"];
|
||||||
var me = self.users_cache[self.my_id];
|
return connection.getModel("im.user").call("assign_name", [uuid, userName]);
|
||||||
delete self.users_cache[self.my_id];
|
}).then(function() {
|
||||||
self.me = me;
|
return self.ensure_users([self.my_id])
|
||||||
connection.connector.call("/longpolling/im/activated", {}).then(function(activated) {
|
}).then(function() {
|
||||||
if (activated) {
|
var me = self.users_cache[self.my_id];
|
||||||
self.activated = true;
|
delete self.users_cache[self.my_id];
|
||||||
$(window).on("unload", self.unload_event_handler);
|
self.me = me;
|
||||||
self.poll();
|
me.set("name", "You");
|
||||||
}
|
connection.connector.call("/longpolling/im/activated", {});
|
||||||
});
|
}).then(function(activated) {
|
||||||
});
|
if (activated) {
|
||||||
});
|
self.activated = true;
|
||||||
|
$(window).on("unload", self.unload_event_handler);
|
||||||
|
self.poll();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
unload: function() {
|
unload: function() {
|
||||||
|
|
Loading…
Reference in New Issue