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

[FIX]mail: attachment 

bzr revid: chm@openerp.com-20121003130318-os2ybnics3zvrsed
This commit is contained in:
Christophe Matthieu 2012-10-03 15:03:18 +02:00
parent fa777f727b
commit 121836232a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_thread_view.xml
View File

@ -18,7 +18,7 @@
<field name="action" ref="action_mail_inbox_feeds"/>
<field name="parent_id" ref="mail_feeds"/>
</record>
<record id="mail_inboxfeeds" model="ir.ui.menu">
<record id="mail_wallfeeds" model="ir.ui.menu">
<field name="name">Wall</field>
<field name="sequence" eval="11"/>
<field name="action" ref="action_mail_wall_feeds"/>

2
addons/mail/static/src/css/mail.css
View File

@ -370,7 +370,7 @@
bottom: 0px;
top: auto;
left: auto;
right: 28px;
right: 0;
height: 26px;
width: 26px;
min-width: 22px;

4
addons/mail/static/src/js/mail.js
View File

@ -148,8 +148,8 @@ openerp.mail = function(session) {
// handle attachment button
this.fileupload_id = _.uniqueId('oe_fileupload');
var button_attach = this.$('button.oe_mail_compose_message_attachment');
var rendered = session.web.qweb.render('mail.compose_message.add_attachment', {'widget': this});
$(rendered).insertBefore(button_attach);
var rendered = $( session.web.qweb.render('mail.compose_message.add_attachment', {'widget': this}) );
rendered.insertBefore(button_attach);
// move the button inside div.oe_hidden_input_file
var input_node = this.$('input[name=ufile]');
button_attach.detach().insertAfter(input_node);