summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorvta vta@openerp.com <>2013-01-02 10:46:08 +0100
committervta vta@openerp.com <>2013-01-02 10:46:08 +0100
commitcc2e7a55bbb41671207c821fc8d9b80424424f51 (patch)
tree3a217182842f899e48173913740d883c4e968c09 /addons/web/static/src
parent8a90401507c7e02deb5fd8c7627c66a2f331c546 (diff)
[FIX] Set Login params.token. Added action_notify and action_warn
bzr revid: vta@openerp.com-20130102094608-tgqdgk31lpsbx05s
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index db418eb6827..ba708b4a925 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -42,6 +42,16 @@ instance.web.Notification = instance.web.Widget.extend({
}
});
+instance.web.action_notify = function(element, action) {
+ element.do_notify(action.params.title, action.params.text, action.params.sticky);
+};
+instance.web.client_actions.add("action_notify", "instance.web.action_notify");
+
+instance.web.action_warn = function(element, action) {
+ element.do_warn(action.params.title, action.params.text, action.params.sticky);
+};
+instance.web.client_actions.add("action_warn", "instance.web.action_warn");
+
/**
* The very minimal function everything should call to create a dialog
* in OpenERP Web Client.
@@ -607,6 +617,9 @@ instance.web.Login = instance.web.Widget.extend({
if ($.deparam.querystring().db) {
self.params.db = $.deparam.querystring().db;
}
+ if ($.param.fragment().token) {
+ self.params.token = $.param.fragment().token;
+ }
// used by dbmanager.do_create via internal client action
if (self.params.db && self.params.login && self.params.password) {
d = self.do_login(self.params.db, self.params.login, self.params.password);