diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-12-10 18:47:28 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-12-10 18:47:28 +0100 |
| commit | 0d02d066756b98ec4bb08178746ba00a4bbcba1b (patch) | |
| tree | 44de1fc71fa09c5cbf5406b9ea3097d1dd678bf5 /addons/mail/static/src | |
| parent | 5520d73d5fc062bdef2e32dba02a79aa831d1f04 (diff) | |
[IMP] mail: announcement bar: hardcode close ttl + update link with dbuuid
bzr revid: chs@openerp.com-20131210174728-hgkbv609mwq8iuu5
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/announcement.js | 15 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/announcement.xml | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/addons/mail/static/src/js/announcement.js b/addons/mail/static/src/js/announcement.js index f61cf534010..0dd438d13af 100644 --- a/addons/mail/static/src/js/announcement.js +++ b/addons/mail/static/src/js/announcement.js @@ -17,7 +17,9 @@ openerp_announcement = function(instance) { if (!dbuuid) { return; } - var $css = $('<link />').attr({ + var $link = $bar.find('.url a'); + $link.attr('href', _.str.sprintf('%s/%s', $link.attr('href'), dbuuid)); + var $css = $('<link />').attr({ rel : 'stylesheet', type: 'text/css', media: 'screen', @@ -25,17 +27,8 @@ openerp_announcement = function(instance) { }); $css.on('load', function() { var close = function() { - var data = window.getComputedStyle($bar.find('.data')[0], ':before').content || "'{}'"; - var delim = data[0]; - data = data.slice(1, data.length - 1).replace(new RegExp('\\\\'+delim, 'g'), delim); - try { - data = JSON.parse(data); - } catch(_e) { - data = {}; - } - var ttl = data.close_ttl || 24*60*60; + var ttl = 7*24*60*60; self.session.set_cookie('ab', 'c', ttl); - $bar.slideUp('slow'); }; $bar.find('.close').on('click', close); diff --git a/addons/mail/static/src/xml/announcement.xml b/addons/mail/static/src/xml/announcement.xml index 1eabb5ebc6b..84dfa426796 100644 --- a/addons/mail/static/src/xml/announcement.xml +++ b/addons/mail/static/src/xml/announcement.xml @@ -6,7 +6,6 @@ <span class="message"></span> <span class="url"><a href="https://services.openerp.com/openerp-enterprise/ab/register" target="_blank"></a></span> <span class="close"></span> - <span class="data"></span> </td> </t> </t> |