diff options
| author | Varun Raval <var@odoo.com> | 2019-04-22 13:07:48 +0000 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2019-06-12 09:26:55 +0000 |
| commit | cbd77876fca743ea923983f882c72fdd8292f149 (patch) | |
| tree | de0538cea9b8b21bdf985be4cec13881405174a2 /addons/mail/data | |
| parent | 047e0ba70809e2ecf674475b6de995d6f1af7a64 (diff) | |
[IMP] web,mail: support line break in activity feedback
Purpose of the commit is when writing feedback on an activity it
doesn't have a line break in it so feedback was printed in a single line.
After this commit feedback will support line break.
Split the line by '\n' in feedback xml template to avoid t-raw.
Avoid `preventDefault` in kanban record when hitting <ENTER> on a textarea.
Task #1965831
closes odoo/odoo#33212
Signed-off-by: Martin Geubelle (mge) <mge@openerp.com>
Diffstat (limited to 'addons/mail/data')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index ee008eb5e31..2f1ce77f0d8 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -321,7 +321,12 @@ <t t-if="display_assignee"> (originally assigned to <span t-field="activity.user_id.name"/>)</t> <span t-if="activity.summary">: </span><span t-if="activity.summary" t-field="activity.summary"/> </p> - <div t-if="feedback" t-esc="feedback"/> + <div t-if="feedback"> + <t t-foreach="feedback.split('\n')" t-as="feedback_line"> + <t t-esc="feedback_line"/> + <br t-if="not feedback_line_last"/> + </t> + </div> <t t-if="activity.note != '<p><br></p>'"><!-- <p></br></p> --> <div class="o_mail_note_title"><strong>Original note:</strong></div> <div t-field="activity.note"/> |