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

[IMP] mail: announcement bar: hardcode close ttl + update link with dbuuid 

bzr revid: chs@openerp.com-20131210174728-hgkbv609mwq8iuu5
This commit is contained in:
Christophe Simonis 2013-12-10 18:47:28 +01:00
parent 5520d73d5f
commit 0d02d06675
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/mail/static/src/js/announcement.js
View File

@ -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);

1
addons/mail/static/src/xml/announcement.xml
View File

@ -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>