diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-10-17 17:09:41 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-10-17 17:09:41 +0200 |
| commit | 81bc720be8c1915f8b8a9d172f06e5309adf0d47 (patch) | |
| tree | e9fe47060c21401daafc67a9d2f18bf4a622fb7a /addons/mail/static/src | |
| parent | de47c4cb526af08382eda3ccb945256682b54337 (diff) | |
[IMP]mail: js/dom in progress
bzr revid: chm@openerp.com-20121017150941-bqwwxndhiytcu3pu
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 02b8479b0fc..62de7bf3842 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -136,7 +136,6 @@ openerp.mail = function(session) { this.options.thread={}; this.options.thread.display_on_thread = options.options.thread.display_on_thread; this.options.thread.show_attachment_delete = true; - this.options.thread.show_attachment_link = true; this.parent_thread= parent.messages!= undefined ? parent : false; @@ -161,11 +160,11 @@ openerp.mail = function(session) { var self = this; var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self})); if(!this.list_attachment){ - this.$('.oe_mail_compose_attachment_list').replaceWith( render ); + this.$('.oe_msg_attachment_list').replaceWith( render ); } else { this.list_attachment.replaceWith( render ); } - this.list_attachment = this.$("ul.oe_msg_attachments"); + this.list_attachment = this.$(".oe_msg_attachments"); // event: delete an attachment this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete); @@ -602,7 +601,7 @@ openerp.mail = function(session) { }, expender: function(){ - this.$('div.oe_msg_body:first').expander({ + this.$('.oe_msg_body:first').expander({ slicePoint: this.options.truncate_limit, expandText: 'read more', userCollapseText: '[^]', diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 03603b65a49..4952c72546b 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -59,7 +59,7 @@ Template used to display attachments in a mail.message --> <t t-name="mail.thread.message.attachments"> - <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}"> + <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0]?'':'oe_hidden'}"> <t t-foreach="widget.datasets.attachment_ids" t-as="attachment"> <li> <span t-if="(attachment.upload or attachment.percent_loaded<100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}"> |