diff options
| author | Jérome Maes <jem@openerp.com> | 2015-03-19 14:08:17 +0100 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2015-03-24 11:48:25 +0100 |
| commit | ebc75e139512ff2f4bf20d2680aa52765c1c9513 (patch) | |
| tree | 322993d7a9daa3fd1e4c61cd6c3c913775d04ee1 /addons/web/static/src | |
| parent | 88f119314f9137f52bc6c01b97c85dfbfabf96ca (diff) | |
[IMP] web : add set_cookie in utils.js (framework) since the get_cookie method already exists. The set_cookie of session.js is now using the one from utils.js
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/framework/session.js | 9 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/utils.js | 17 |
2 files changed, 19 insertions, 7 deletions
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js index 4cc9a481b4d..5f6d4c91ea2 100644 --- a/addons/web/static/src/js/framework/session.js +++ b/addons/web/static/src/js/framework/session.js @@ -156,12 +156,7 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, { set_cookie: function (name, value, ttl) { if (!this.name) { return; } ttl = ttl || 24*60*60*365; - document.cookie = [ - this.name + '|' + name + '=' + encodeURIComponent(JSON.stringify(value)), - 'path=/', - 'max-age=' + ttl, - 'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString() - ].join(';'); + utils.set_cookie(this.name + '|' + name, value, ttl); }, /** * Load additional web addons of that instance and init them @@ -388,7 +383,7 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, { qs = "?" + qs; var prefix = _.any(['http://', 'https://', '//'], function(el) { return path.length >= el.length && path.slice(0, el.length) === el; - }) ? '' : this.prefix; + }) ? '' : this.prefix; return prefix + path + qs; }, }); diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index 29a15d47a30..b13688aa538 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -223,6 +223,22 @@ function get_cookie (c_name) { } /** + * Create a cookie + * @param {String} name : the name of the cookie + * @param {String} value : the value stored in the cookie + * @param {Integer} ttl : time to live of the cookie in millis. -1 to erase the cookie. + */ +function set_cookie(name, value, ttl) { + ttl = ttl || 24*60*60*365; + document.cookie = [ + name + '=' + value, + 'path=/', + 'max-age=' + ttl, + 'expires=' + new Date(new Date().getTime() + ttl*1000).toGMTString() + ].join(';'); +}; + +/** * Insert "thousands" separators in the provided number (which is actually * a string) * @@ -368,6 +384,7 @@ return { xml_to_str: xml_to_str, Mutex: Mutex, get_cookie: get_cookie, + set_cookie: set_cookie, insert_thousand_seps: insert_thousand_seps, is_bin_size: is_bin_size, binary_to_binsize: binary_to_binsize, |
