[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>
This commit is contained in:
Varun Raval
2019-06-12 09:26:55 +00:00
committed by Martin Geubelle
parent 047e0ba708
commit cbd77876fc
2 changed files with 11 additions and 4 deletions
+6 -1
View File
@@ -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 != '&lt;p&gt;&lt;br&gt;&lt;/p&gt;'"><!-- <p></br></p> -->
<div class="o_mail_note_title"><strong>Original note:</strong></div>
<div t-field="activity.note"/>
@@ -695,9 +695,11 @@ var KanbanRecord = Widget.extend({
_onKeyDownCard: function (event) {
switch (event.keyCode) {
case $.ui.keyCode.ENTER:
event.preventDefault();
this._onGlobalClick(event);
break;
if ($(event.target).hasClass('oe_kanban_global_click')) {
event.preventDefault();
this._onGlobalClick(event);
break;
}
}
},
/**