Revert "[IMP] mail: Subject and body readonly if mass_x composition_mode"
This reverts commit2774e3b4a8. Wrong manipulation of the "merge button" The fix was already merged at5a0dcd3c2
This commit is contained in:
@@ -455,7 +455,7 @@ class MailComposer(models.TransientModel):
|
||||
for res_id in res_ids:
|
||||
results[res_id] = {
|
||||
'subject': subjects[res_id] if subjects else False,
|
||||
'body': bodies[res_id] if bodies else False,
|
||||
'body': bodies[res_id] if subjects else False,
|
||||
'email_from': emails_from[res_id],
|
||||
'reply_to': replies_to[res_id],
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
context="{'force_email':True, 'show_email':True}"
|
||||
attrs="{'invisible': [('composition_mode', '!=', 'comment')]}"/>
|
||||
</div>
|
||||
<field name="subject" placeholder="Subject..." required="True" attrs="{'readonly':[('composition_mode', 'in', ('mass_mail','mass_post'))]}"/>
|
||||
<field name="subject" placeholder="Subject..." required="True"/>
|
||||
<!-- mass post -->
|
||||
<field name="notify"
|
||||
attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_post')]}"/>
|
||||
@@ -57,7 +57,7 @@
|
||||
attrs="{'invisible':['|', ('no_auto_thread', '=', False), ('composition_mode', '!=', 'mass_mail')],
|
||||
'required':[('no_auto_thread', '=', True), ('composition_mode', '=', 'mass_mail')]}"/>
|
||||
</group>
|
||||
<field name="body" attrs="{'readonly':[('composition_mode', 'in', ('mass_mail','mass_post'))]}" options="{'style-inline': true}"/>
|
||||
<field name="body" options="{'style-inline': true}"/>
|
||||
<group col="4">
|
||||
<field name="attachment_ids" widget="many2many_binary" string="Attach a file" nolabel="1" colspan="2"/>
|
||||
<field name="template_id" options="{'no_create': True}"
|
||||
|
||||
Reference in New Issue
Block a user